/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_emacs.idb / usr / freeware / share / emacs / 19.34 / lisp / ediff-wind.elc.z / ediff-wind.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 6e 75 |piled by| kwzh@nu|
|00000020| 74 72 69 6d 61 74 2e 67 | 6e 75 2e 61 69 2e 6d 69 |trimat.g|nu.ai.mi|
|00000030| 74 2e 65 64 75 20 6f 6e | 20 57 65 64 20 4a 75 6c |t.edu on| Wed Jul|
|00000040| 20 31 37 20 31 35 3a 34 | 31 3a 34 35 20 31 39 39 | 17 15:4|1:45 199|
|00000050| 36 0a 3b 3b 3b 20 66 72 | 6f 6d 20 66 69 6c 65 20 |6.;;; fr|om file |
|00000060| 2f 67 64 2f 67 6e 75 2f | 65 6d 61 63 73 2f 31 39 |/gd/gnu/|emacs/19|
|00000070| 2e 30 2f 6c 69 73 70 2f | 65 64 69 66 66 2d 77 69 |.0/lisp/|ediff-wi|
|00000080| 6e 64 2e 65 6c 0a 3b 3b | 3b 20 65 6d 61 63 73 20 |nd.el.;;|; emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 33 31 2e 39 34 |version |19.31.94|
|000000a0| 2e 31 2e 0a 3b 3b 3b 20 | 62 79 74 65 63 6f 6d 70 |.1..;;; |bytecomp|
|000000b0| 20 76 65 72 73 69 6f 6e | 20 46 53 46 20 32 2e 31 | version| FSF 2.1|
|000000c0| 30 0a 3b 3b 3b 20 6f 70 | 74 69 6d 69 7a 61 74 69 |0.;;; op|timizati|
|000000d0| 6f 6e 20 69 73 20 6f 6e | 2e 0a 3b 3b 3b 20 74 68 |on is on|..;;; th|
|000000e0| 69 73 20 66 69 6c 65 20 | 75 73 65 73 20 6f 70 63 |is file |uses opc|
|000000f0| 6f 64 65 73 20 77 68 69 | 63 68 20 64 6f 20 6e 6f |odes whi|ch do no|
|00000100| 74 20 65 78 69 73 74 20 | 69 6e 20 45 6d 61 63 73 |t exist |in Emacs|
|00000110| 20 31 38 2e 0a 0a 28 69 | 66 20 28 61 6e 64 20 28 | 18...(i|f (and (|
|00000120| 62 6f 75 6e 64 70 20 27 | 65 6d 61 63 73 2d 76 65 |boundp '|emacs-ve|
|00000130| 72 73 69 6f 6e 29 0a 09 | 20 28 6f 72 20 28 61 6e |rsion)..| (or (an|
|00000140| 64 20 28 62 6f 75 6e 64 | 70 20 27 65 70 6f 63 68 |d (bound|p 'epoch|
|00000150| 3a 3a 76 65 72 73 69 6f | 6e 29 20 65 70 6f 63 68 |::versio|n) epoch|
|00000160| 3a 3a 76 65 72 73 69 6f | 6e 29 0a 09 20 20 20 20 |::versio|n)..    |
|00000170| 20 28 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 65 | (string|-lessp e|
|00000180| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 22 31 39 |macs-ver|sion "19|
|00000190| 2e 32 39 22 29 29 29 0a | 20 20 20 20 28 65 72 72 |.29"))).|    (err|
|000001a0| 6f 72 20 22 60 65 64 69 | 66 66 2d 77 69 6e 64 2e |or "`edi|ff-wind.|
|000001b0| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|000001c0| 20 66 6f 72 20 45 6d 61 | 63 73 20 31 39 2e 32 39 | for Ema|cs 19.29|
|000001d0| 20 6f 72 20 6c 61 74 65 | 72 22 29 29 0a 0a 0a 28 | or late|r"))...(|
|000001e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|000001f0| 0b 42 13 c4 0b 42 13 c5 | 0b 42 13 c6 0b 42 13 c7 |.B...B..|.B...B..|
|00000200| 0b 42 13 c8 0b 42 13 c9 | 0b 42 13 ca 0b 42 13 cb |.B...B..|.B...B..|
|00000210| 0b 42 13 c0 87 22 20 5b | 72 65 71 75 69 72 65 20 |.B..." [|require |
|00000220| 65 64 69 66 66 2d 69 6e | 69 74 20 69 63 6f 6e 2d |ediff-in|it icon-|
|00000230| 74 69 74 6c 65 2d 66 6f | 72 6d 61 74 20 63 75 72 |title-fo|rmat cur|
|00000240| 72 65 6e 74 2d 6c 6f 61 | 64 2d 6c 69 73 74 20 74 |rent-loa|d-list t|
|00000250| 6f 70 2d 74 6f 6f 6c 62 | 61 72 2d 68 65 69 67 68 |op-toolb|ar-heigh|
|00000260| 74 20 62 6f 74 74 6f 6d | 2d 74 6f 6f 6c 62 61 72 |t bottom|-toolbar|
|00000270| 2d 68 65 69 67 68 74 20 | 6c 65 66 74 2d 74 6f 6f |-height |left-too|
|00000280| 6c 62 61 72 2d 68 65 69 | 67 68 74 20 72 69 67 68 |lbar-hei|ght righ|
|00000290| 74 2d 74 6f 6f 6c 62 61 | 72 2d 68 65 69 67 68 74 |t-toolba|r-height|
|000002a0| 20 6c 65 66 74 2d 74 6f | 6f 6c 62 61 72 2d 77 69 | left-to|olbar-wi|
|000002b0| 64 74 68 20 72 69 67 68 | 74 2d 74 6f 6f 6c 62 61 |dth righ|t-toolba|
|000002c0| 72 2d 77 69 64 74 68 20 | 64 65 66 61 75 6c 74 2d |r-width |default-|
|000002d0| 6d 65 6e 75 62 61 72 20 | 66 72 61 6d 65 2d 69 63 |menubar |frame-ic|
|000002e0| 6f 6e 2d 74 69 74 6c 65 | 2d 66 6f 72 6d 61 74 5d |on-title|-format]|
|000002f0| 20 32 29 0a 23 40 39 39 | 35 20 2a 46 75 6e 63 74 | 2).#@99|5 *Funct|
|00000300| 69 6f 6e 20 63 61 6c 6c | 65 64 20 74 6f 20 73 65 |ion call|ed to se|
|00000310| 74 20 75 70 20 77 69 6e | 64 6f 77 73 2e 0a 45 64 |t up win|dows..Ed|
|00000320| 69 66 66 20 70 72 6f 76 | 69 64 65 73 20 61 20 63 |iff prov|ides a c|
|00000330| 68 6f 69 63 65 20 6f 66 | 20 74 77 6f 20 66 75 6e |hoice of| two fun|
|00000340| 63 74 69 6f 6e 73 3a 20 | 65 64 69 66 66 2d 73 65 |ctions: |ediff-se|
|00000350| 74 75 70 2d 77 69 6e 64 | 6f 77 73 2d 70 6c 61 69 |tup-wind|ows-plai|
|00000360| 6e 2c 20 66 6f 72 0a 64 | 6f 69 6e 67 20 65 76 65 |n, for.d|oing eve|
|00000370| 72 79 74 68 69 6e 67 20 | 69 6e 20 6f 6e 65 20 66 |rything |in one f|
|00000380| 72 61 6d 65 2c 20 61 6e | 64 20 65 64 69 66 66 2d |rame, an|d ediff-|
|00000390| 73 65 74 75 70 2d 77 69 | 6e 64 6f 77 73 2d 6d 75 |setup-wi|ndows-mu|
|000003a0| 6c 74 69 66 72 61 6d 65 | 2c 0a 77 68 69 63 68 20 |ltiframe|,.which |
|000003b0| 73 65 74 73 20 74 68 65 | 20 63 6f 6e 74 72 6f 6c |sets the| control|
|000003c0| 20 70 61 6e 65 6c 20 69 | 6e 20 61 20 73 65 70 61 | panel i|n a sepa|
|000003d0| 72 61 74 65 20 66 72 61 | 6d 65 2e 20 41 6c 73 6f |rate fra|me. Also|
|000003e0| 2c 20 69 66 20 74 68 65 | 20 6c 61 74 74 65 72 0a |, if the| latter.|
|000003f0| 66 75 6e 63 74 69 6f 6e | 20 64 65 74 65 63 74 73 |function| detects|
|00000400| 20 74 68 61 74 20 6f 6e | 65 20 6f 66 20 74 68 65 | that on|e of the|
|00000410| 20 62 75 66 66 65 72 73 | 20 41 2f 42 20 69 73 20 | buffers| A/B is |
|00000420| 73 65 65 6e 20 69 6e 20 | 73 6f 6d 65 20 6f 74 68 |seen in |some oth|
|00000430| 65 72 20 66 72 61 6d 65 | 2c 0a 69 74 20 77 69 6c |er frame|,.it wil|
|00000440| 6c 20 74 72 79 20 74 6f | 20 6b 65 65 70 20 74 68 |l try to| keep th|
|00000450| 61 74 20 62 75 66 66 65 | 72 20 69 6e 20 74 68 61 |at buffe|r in tha|
|00000460| 74 20 66 72 61 6d 65 2e | 0a 0a 49 66 20 79 6f 75 |t frame.|..If you|
|00000470| 20 64 6f 6e 27 74 20 6c | 69 6b 65 20 74 68 65 20 | don't l|ike the |
|00000480| 74 77 6f 20 66 75 6e 63 | 74 69 6f 6e 73 20 70 72 |two func|tions pr|
|00000490| 6f 76 69 64 65 64 2d 2d | 2d 77 72 69 74 65 20 79 |ovided--|-write y|
|000004a0| 6f 75 72 20 6f 77 6e 20 | 6f 6e 65 2e 0a 54 68 65 |our own |one..The|
|000004b0| 20 62 61 73 69 63 20 67 | 75 69 64 65 6c 69 6e 65 | basic g|uideline|
|000004c0| 73 3a 0a 20 20 20 20 31 | 2e 20 49 74 20 73 68 6f |s:.    1|. It sho|
|000004d0| 75 6c 64 20 6c 65 61 76 | 65 20 74 68 65 20 63 6f |uld leav|e the co|
|000004e0| 6e 74 72 6f 6c 20 62 75 | 66 66 65 72 20 63 75 72 |ntrol bu|ffer cur|
|000004f0| 72 65 6e 74 20 61 6e 64 | 20 74 68 65 20 63 6f 6e |rent and| the con|
|00000500| 74 72 6f 6c 20 77 69 6e | 64 6f 77 0a 20 20 20 20 |trol win|dow.    |
|00000510| 20 20 20 73 65 6c 65 63 | 74 65 64 2e 20 0a 20 20 |   selec|ted. .  |
|00000520| 20 20 32 2e 20 49 74 20 | 73 68 6f 75 6c 64 20 73 |  2. It |should s|
|00000530| 65 74 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |et ediff|-window-|
|00000540| 41 2c 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |A, ediff|-window-|
|00000550| 42 2c 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |B, ediff|-window-|
|00000560| 43 2c 0a 20 20 20 20 20 | 20 20 61 6e 64 20 65 64 |C,.     |  and ed|
|00000570| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 77 69 6e 64 |iff-cont|rol-wind|
|00000580| 6f 77 20 74 6f 20 63 6f | 6e 74 61 69 6e 20 77 69 |ow to co|ntain wi|
|00000590| 6e 64 6f 77 20 6f 62 6a | 65 63 74 73 20 74 68 61 |ndow obj|ects tha|
|000005a0| 74 20 64 69 73 70 6c 61 | 79 0a 20 20 20 20 20 20 |t displa|y.      |
|000005b0| 20 74 68 65 20 63 6f 72 | 72 65 73 70 6f 6e 64 69 | the cor|respondi|
|000005c0| 6e 67 20 62 75 66 66 65 | 72 73 2e 0a 20 20 20 20 |ng buffe|rs..    |
|000005d0| 33 2e 20 49 74 20 73 68 | 6f 75 6c 64 20 61 63 63 |3. It sh|ould acc|
|000005e0| 65 70 74 20 74 68 65 20 | 66 6f 6c 6c 6f 77 69 6e |ept the |followin|
|000005f0| 67 20 61 72 67 75 6d 65 | 6e 74 73 3a 0a 20 20 20 |g argume|nts:.   |
|00000600| 20 20 20 20 62 75 66 66 | 65 72 2d 41 2c 20 62 75 |    buff|er-A, bu|
|00000610| 66 66 65 72 2d 42 2c 20 | 62 75 66 66 65 72 2d 43 |ffer-B, |buffer-C|
|00000620| 2c 20 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |, contro|l-buffer|
|00000630| 0a 20 20 20 20 20 20 20 | 42 75 66 66 65 72 20 43 |.       |Buffer C|
|00000640| 20 6d 61 79 20 6e 6f 74 | 20 62 65 20 75 73 65 64 | may not| be used|
|00000650| 20 69 6e 20 6a 6f 62 73 | 20 74 68 61 74 20 63 6f | in jobs| that co|
|00000660| 6d 70 61 72 65 20 6f 6e | 6c 79 20 74 77 6f 20 62 |mpare on|ly two b|
|00000670| 75 66 66 65 72 73 2e 0a | 49 66 20 79 6f 75 20 70 |uffers..|If you p|
|00000680| 6c 61 6e 20 74 6f 20 64 | 6f 20 73 6f 6d 65 74 68 |lan to d|o someth|
|00000690| 69 6e 67 20 66 61 6e 63 | 79 2c 20 74 61 6b 65 20 |ing fanc|y, take |
|000006a0| 61 20 63 6c 6f 73 65 20 | 6c 6f 6f 6b 20 61 74 20 |a close |look at |
|000006b0| 68 6f 77 20 74 68 65 20 | 74 77 6f 0a 70 72 6f 76 |how the |two.prov|
|000006c0| 69 64 65 64 20 66 75 6e | 63 74 69 6f 6e 73 20 61 |ided fun|ctions a|
|000006d0| 72 65 20 77 72 69 74 74 | 65 6e 2e 1f 0a 28 64 65 |re writt|en...(de|
|000006e0| 66 76 61 72 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |fvar edi|ff-windo|
|000006f0| 77 2d 73 65 74 75 70 2d | 66 75 6e 63 74 69 6f 6e |w-setup-|function|
|00000700| 20 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 20 83 | (byte-c|ode ". .|
|00000710| 07 00 c1 87 c2 87 22 20 | 5b 65 64 69 66 66 2d 77 |......" |[ediff-w|
|00000720| 69 6e 64 6f 77 2d 64 69 | 73 70 6c 61 79 2d 70 20 |indow-di|splay-p |
|00000730| 65 64 69 66 66 2d 73 65 | 74 75 70 2d 77 69 6e 64 |ediff-se|tup-wind|
|00000740| 6f 77 73 2d 6d 75 6c 74 | 69 66 72 61 6d 65 20 65 |ows-mult|iframe e|
|00000750| 64 69 66 66 2d 73 65 74 | 75 70 2d 77 69 6e 64 6f |diff-set|up-windo|
|00000760| 77 73 2d 70 6c 61 69 6e | 5d 20 31 29 20 28 23 24 |ws-plain|] 1) (#$|
|00000770| 20 2e 20 2d 37 36 32 29 | 29 0a 23 40 32 20 1f 0a | . -762)|).#@2 ..|
|00000780| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 6d 75 |(defvar |ediff-mu|
|00000790| 6c 74 69 66 72 61 6d 65 | 20 6e 69 6c 20 28 23 24 |ltiframe| nil (#$|
|000007a0| 20 2e 20 31 39 31 38 29 | 29 0a 28 62 79 74 65 2d | . 1918)|).(byte-|
|000007b0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|000007c0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|000007d0| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|000007e0| 69 66 66 2d 6d 75 6c 74 | 69 66 72 61 6d 65 20 70 |iff-mult|iframe p|
|000007f0| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00000800| 61 6c 20 74 5d 20 34 29 | 0a 23 40 32 20 1f 0a 28 |al t] 4)|.#@2 ..(|
|00000810| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 6d 65 72 |defvar e|diff-mer|
|00000820| 67 65 2d 77 69 6e 64 6f | 77 2d 73 68 61 72 65 20 |ge-windo|w-share |
|00000830| 30 2e 34 35 30 30 30 30 | 30 30 30 30 30 30 30 30 |0.450000|00000000|
|00000840| 30 30 31 20 28 23 24 20 | 2e 20 32 30 36 31 29 29 |001 (#$ |. 2061))|
|00000850| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00000860| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00000870| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00000880| 6f 63 61 6c 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |ocal edi|ff-merge|
|00000890| 2d 77 69 6e 64 6f 77 2d | 73 68 61 72 65 20 70 75 |-window-|share pu|
|000008a0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000008b0| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|000008c0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 63 6f 6e 74 |efvar ed|iff-cont|
|000008d0| 72 6f 6c 2d 77 69 6e 64 | 6f 77 20 6e 69 6c 20 28 |rol-wind|ow nil (|
|000008e0| 23 24 20 2e 20 32 32 33 | 36 29 29 0a 28 62 79 74 |#$ . 223|6)).(byt|
|000008f0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00000900| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00000910| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00000920| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 77 69 |ediff-co|ntrol-wi|
|00000930| 6e 64 6f 77 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |ndow put| permane|
|00000940| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 23 |nt-local| t] 4).#|
|00000950| 40 32 20 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |@2 ..(de|fvar edi|
|00000960| 66 66 2d 77 69 6e 64 6f | 77 2d 41 20 6e 69 6c 20 |ff-windo|w-A nil |
|00000970| 28 23 24 20 2e 20 32 33 | 38 37 29 29 0a 28 62 79 |(#$ . 23|87)).(by|
|00000980| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00000990| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|000009a0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|000009b0| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 41 20 | ediff-w|indow-A |
|000009c0| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|000009d0| 63 61 6c 20 74 5d 20 34 | 29 0a 23 40 32 20 1f 0a |cal t] 4|).#@2 ..|
|000009e0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 77 69 |(defvar |ediff-wi|
|000009f0| 6e 64 6f 77 2d 42 20 6e | 69 6c 20 28 23 24 20 2e |ndow-B n|il (#$ .|
|00000a00| 20 32 35 32 36 29 29 0a | 28 62 79 74 65 2d 63 6f | 2526)).|(byte-co|
|00000a10| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00000a20| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00000a30| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00000a40| 66 2d 77 69 6e 64 6f 77 | 2d 42 20 70 75 74 20 70 |f-window|-B put p|
|00000a50| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00000a60| 5d 20 34 29 0a 23 40 32 | 20 1f 0a 28 64 65 66 76 |] 4).#@2| ..(defv|
|00000a70| 61 72 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |ar ediff|-window-|
|00000a80| 43 20 6e 69 6c 20 28 23 | 24 20 2e 20 32 36 36 35 |C nil (#|$ . 2665|
|00000a90| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00000aa0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00000ab0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00000ac0| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 77 69 6e |-local e|diff-win|
|00000ad0| 64 6f 77 2d 43 20 70 75 | 74 20 70 65 72 6d 61 6e |dow-C pu|t perman|
|00000ae0| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00000af0| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00000b00| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 63 6f 6e 66 69 |iff-wind|ow-confi|
|00000b10| 67 2d 73 61 76 65 64 20 | 22 22 20 28 23 24 20 2e |g-saved |"" (#$ .|
|00000b20| 20 32 38 30 34 29 29 0a | 28 62 79 74 65 2d 63 6f | 2804)).|(byte-co|
|00000b30| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00000b40| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00000b50| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00000b60| 66 2d 77 69 6e 64 6f 77 | 2d 63 6f 6e 66 69 67 2d |f-window|-config-|
|00000b70| 73 61 76 65 64 20 70 75 | 74 20 70 65 72 6d 61 6e |saved pu|t perman|
|00000b80| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00000b90| 23 40 34 30 37 20 2a 54 | 68 65 20 66 75 6e 63 74 |#@407 *T|he funct|
|00000ba0| 69 6f 6e 20 75 73 65 64 | 20 74 6f 20 73 70 6c 69 |ion used| to spli|
|00000bb0| 74 20 74 68 65 20 6d 61 | 69 6e 20 77 69 6e 64 6f |t the ma|in windo|
|00000bc0| 77 20 62 65 74 77 65 65 | 6e 20 62 75 66 66 65 72 |w betwee|n buffer|
|00000bd0| 2d 41 20 61 6e 64 20 62 | 75 66 66 65 72 2d 42 2e |-A and b|uffer-B.|
|00000be0| 0a 59 6f 75 20 63 61 6e | 20 73 65 74 20 69 74 20 |.You can| set it |
|00000bf0| 74 6f 20 61 20 68 6f 72 | 69 7a 6f 6e 74 61 6c 20 |to a hor|izontal |
|00000c00| 73 70 6c 69 74 20 69 6e | 73 74 65 61 64 20 6f 66 |split in|stead of|
|00000c10| 20 74 68 65 20 64 65 66 | 61 75 6c 74 20 76 65 72 | the def|ault ver|
|00000c20| 74 69 63 61 6c 20 73 70 | 6c 69 74 0a 62 79 20 73 |tical sp|lit.by s|
|00000c30| 65 74 74 69 6e 67 20 74 | 68 69 73 20 76 61 72 69 |etting t|his vari|
|00000c40| 61 62 6c 65 20 74 6f 20 | 60 73 70 6c 69 74 2d 77 |able to |`split-w|
|00000c50| 69 6e 64 6f 77 2d 68 6f | 72 69 7a 6f 6e 74 61 6c |indow-ho|rizontal|
|00000c60| 6c 79 27 2e 0a 59 6f 75 | 20 63 61 6e 20 61 6c 73 |ly'..You| can als|
|00000c70| 6f 20 68 61 76 65 20 79 | 6f 75 72 20 6f 77 6e 20 |o have y|our own |
|00000c80| 66 75 6e 63 74 69 6f 6e | 20 74 6f 20 64 6f 20 66 |function| to do f|
|00000c90| 61 6e 63 79 20 73 70 6c | 69 74 73 2e 0a 54 68 69 |ancy spl|its..Thi|
|00000ca0| 73 20 76 61 72 69 61 62 | 6c 65 20 68 61 73 20 6e |s variab|le has n|
|00000cb0| 6f 20 65 66 66 65 63 74 | 20 77 68 65 6e 20 62 75 |o effect| when bu|
|00000cc0| 66 66 65 72 2d 41 2f 42 | 20 61 72 65 20 73 68 6f |ffer-A/B| are sho|
|00000cd0| 77 6e 20 69 6e 20 64 69 | 66 66 65 72 65 6e 74 20 |wn in di|fferent |
|00000ce0| 66 72 61 6d 65 73 2e 0a | 49 6e 20 74 68 69 73 20 |frames..|In this |
|00000cf0| 63 61 73 65 2c 20 45 64 | 69 66 66 20 77 69 6c 6c |case, Ed|iff will|
|00000d00| 20 75 73 65 20 74 68 6f | 73 65 20 66 72 61 6d 65 | use tho|se frame|
|00000d10| 73 20 74 6f 20 64 69 73 | 70 6c 61 79 20 74 68 65 |s to dis|play the|
|00000d20| 73 65 20 62 75 66 66 65 | 72 73 2e 1f 0a 28 64 65 |se buffe|rs...(de|
|00000d30| 66 76 61 72 20 65 64 69 | 66 66 2d 73 70 6c 69 74 |fvar edi|ff-split|
|00000d40| 2d 77 69 6e 64 6f 77 2d | 66 75 6e 63 74 69 6f 6e |-window-|function|
|00000d50| 20 28 71 75 6f 74 65 20 | 73 70 6c 69 74 2d 77 69 | (quote |split-wi|
|00000d60| 6e 64 6f 77 2d 76 65 72 | 74 69 63 61 6c 6c 79 29 |ndow-ver|tically)|
|00000d70| 20 28 23 24 20 2e 20 2d | 32 39 36 36 29 29 0a 23 | (#$ . -|2966)).#|
|00000d80| 40 34 30 37 20 2a 54 68 | 65 20 66 75 6e 63 74 69 |@407 *Th|e functi|
|00000d90| 6f 6e 20 75 73 65 64 20 | 74 6f 20 73 70 6c 69 74 |on used |to split|
|00000da0| 20 74 68 65 20 6d 61 69 | 6e 20 77 69 6e 64 6f 77 | the mai|n window|
|00000db0| 20 62 65 74 77 65 65 6e | 20 62 75 66 66 65 72 2d | between| buffer-|
|00000dc0| 41 20 61 6e 64 20 62 75 | 66 66 65 72 2d 42 2e 0a |A and bu|ffer-B..|
|00000dd0| 59 6f 75 20 63 61 6e 20 | 73 65 74 20 69 74 20 74 |You can |set it t|
|00000de0| 6f 20 61 20 76 65 72 74 | 69 63 61 6c 20 73 70 6c |o a vert|ical spl|
|00000df0| 69 74 20 69 6e 73 74 65 | 61 64 20 6f 66 20 74 68 |it inste|ad of th|
|00000e00| 65 20 64 65 66 61 75 6c | 74 20 68 6f 72 69 7a 6f |e defaul|t horizo|
|00000e10| 6e 74 61 6c 20 73 70 6c | 69 74 0a 62 79 20 73 65 |ntal spl|it.by se|
|00000e20| 74 74 69 6e 67 20 74 68 | 69 73 20 76 61 72 69 61 |tting th|is varia|
|00000e30| 62 6c 65 20 74 6f 20 60 | 73 70 6c 69 74 2d 77 69 |ble to `|split-wi|
|00000e40| 6e 64 6f 77 2d 76 65 72 | 74 69 63 61 6c 6c 79 27 |ndow-ver|tically'|
|00000e50| 2e 0a 59 6f 75 20 63 61 | 6e 20 61 6c 73 6f 20 68 |..You ca|n also h|
|00000e60| 61 76 65 20 79 6f 75 72 | 20 6f 77 6e 20 66 75 6e |ave your| own fun|
|00000e70| 63 74 69 6f 6e 20 74 6f | 20 64 6f 20 66 61 6e 63 |ction to| do fanc|
|00000e80| 79 20 73 70 6c 69 74 73 | 2e 0a 54 68 69 73 20 76 |y splits|..This v|
|00000e90| 61 72 69 61 62 6c 65 20 | 68 61 73 20 6e 6f 20 65 |ariable |has no e|
|00000ea0| 66 66 65 63 74 20 77 68 | 65 6e 20 62 75 66 66 65 |ffect wh|en buffe|
|00000eb0| 72 2d 41 2f 42 2f 43 20 | 61 72 65 20 73 68 6f 77 |r-A/B/C |are show|
|00000ec0| 6e 20 69 6e 20 64 69 66 | 66 65 72 65 6e 74 20 66 |n in dif|ferent f|
|00000ed0| 72 61 6d 65 73 2e 0a 49 | 6e 20 74 68 69 73 20 63 |rames..I|n this c|
|00000ee0| 61 73 65 2c 20 45 64 69 | 66 66 20 77 69 6c 6c 20 |ase, Edi|ff will |
|00000ef0| 75 73 65 20 74 68 6f 73 | 65 20 66 72 61 6d 65 73 |use thos|e frames|
|00000f00| 20 74 6f 20 64 69 73 70 | 6c 61 79 20 74 68 65 73 | to disp|lay thes|
|00000f10| 65 20 62 75 66 66 65 72 | 73 2e 1f 0a 28 64 65 66 |e buffer|s...(def|
|00000f20| 76 61 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |var edif|f-merge-|
|00000f30| 73 70 6c 69 74 2d 77 69 | 6e 64 6f 77 2d 66 75 6e |split-wi|ndow-fun|
|00000f40| 63 74 69 6f 6e 20 28 71 | 75 6f 74 65 20 73 70 6c |ction (q|uote spl|
|00000f50| 69 74 2d 77 69 6e 64 6f | 77 2d 68 6f 72 69 7a 6f |it-windo|w-horizo|
|00000f60| 6e 74 61 6c 6c 79 29 20 | 28 23 24 20 2e 20 2d 33 |ntally) |(#$ . -3|
|00000f70| 34 36 31 29 29 0a 23 40 | 31 32 36 20 46 72 61 6d |461)).#@|126 Fram|
|00000f80| 65 20 70 61 72 61 6d 65 | 74 65 72 73 20 66 6f 72 |e parame|ters for|
|00000f90| 20 64 69 73 70 6c 61 79 | 69 6e 67 20 45 64 69 66 | display|ing Edif|
|00000fa0| 66 20 43 6f 6e 74 72 6f | 6c 20 50 61 6e 65 6c 2e |f Contro|l Panel.|
|00000fb0| 0a 44 6f 20 6e 6f 74 20 | 73 70 65 63 69 66 79 20 |.Do not |specify |
|00000fc0| 77 69 64 74 68 20 61 6e | 64 20 68 65 69 67 68 74 |width an|d height|
|00000fd0| 20 68 65 72 65 2e 20 54 | 68 65 73 65 20 61 72 65 | here. T|hese are|
|00000fe0| 20 63 6f 6d 70 75 74 65 | 64 20 61 75 74 6f 6d 61 | compute|d automa|
|00000ff0| 74 69 63 61 6c 6c 79 2e | 1f 0a 28 64 65 66 63 6f |tically.|..(defco|
|00001000| 6e 73 74 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |nst edif|f-contro|
|00001010| 6c 2d 66 72 61 6d 65 2d | 70 61 72 61 6d 65 74 65 |l-frame-|paramete|
|00001020| 72 73 20 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |rs (byte|-code ".|
|00001030| c1 c2 c3 c4 c5 c6 c7 c8 | c9 ca 21 83 15 00 ca 20 |........|..!.... |
|00001040| 54 82 16 00 cb 42 cc c9 | cd 21 83 24 00 cd 20 54 |T....B..|.!.$.. T|
|00001050| 82 25 00 cb 42 af 5c 6e | 87 22 20 5b 28 6e 61 6d |.%..B.\n|." [(nam|
|00001060| 65 20 2e 20 22 45 64 69 | 66 66 22 29 20 28 6d 69 |e . "Edi|ff") (mi|
|00001070| 6e 69 62 75 66 66 65 72 | 29 20 28 75 73 65 72 2d |nibuffer|) (user-|
|00001080| 70 6f 73 69 74 69 6f 6e | 20 2e 20 74 29 20 28 76 |position| . t) (v|
|00001090| 65 72 74 69 63 61 6c 2d | 73 63 72 6f 6c 6c 2d 62 |ertical-|scroll-b|
|000010a0| 61 72 73 29 20 28 73 63 | 72 6f 6c 6c 62 61 72 2d |ars) (sc|rollbar-|
|000010b0| 77 69 64 74 68 20 2e 20 | 30 29 20 28 6d 65 6e 75 |width . |0) (menu|
|000010c0| 2d 62 61 72 2d 6c 69 6e | 65 73 20 2e 20 30 29 20 |-bar-lin|es . 0) |
|000010d0| 28 61 75 74 6f 2d 6c 6f | 77 65 72 29 20 28 61 75 |(auto-lo|wer) (au|
|000010e0| 74 6f 2d 72 61 69 73 65 | 20 2e 20 74 29 20 74 6f |to-raise| . t) to|
|000010f0| 70 20 66 62 6f 75 6e 64 | 70 20 65 64 69 66 66 2d |p fbound|p ediff-|
|00001100| 64 69 73 70 6c 61 79 2d | 70 69 78 65 6c 2d 68 65 |display-|pixel-he|
|00001110| 69 67 68 74 20 33 30 30 | 30 20 6c 65 66 74 20 65 |ight 300|0 left e|
|00001120| 64 69 66 66 2d 64 69 73 | 70 6c 61 79 2d 70 69 78 |diff-dis|play-pix|
|00001130| 65 6c 2d 77 69 64 74 68 | 5d 20 31 32 29 20 28 23 |el-width|] 12) (#|
|00001140| 24 20 2e 20 33 39 36 34 | 29 29 0a 23 40 32 20 1f |$ . 3964|)).#@2 .|
|00001150| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 6d |.(defvar| ediff-m|
|00001160| 6f 75 73 65 2d 70 69 78 | 65 6c 2d 70 6f 73 69 74 |ouse-pix|el-posit|
|00001170| 69 6f 6e 20 6e 69 6c 20 | 28 23 24 20 2e 20 34 34 |ion nil |(#$ . 44|
|00001180| 33 31 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |31)).(by|te-code |
|00001190| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|000011a0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000011b0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 6d |er-local| ediff-m|
|000011c0| 6f 75 73 65 2d 70 69 78 | 65 6c 2d 70 6f 73 69 74 |ouse-pix|el-posit|
|000011d0| 69 6f 6e 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ion put |permanen|
|000011e0| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|000011f0| 39 37 20 49 66 20 74 68 | 65 20 75 73 65 72 20 6d |97 If th|e user m|
|00001200| 6f 76 65 73 20 6d 6f 75 | 73 65 20 6d 6f 72 65 20 |oves mou|se more |
|00001210| 74 68 61 6e 20 74 68 69 | 73 20 6d 61 6e 79 20 70 |than thi|s many p|
|00001220| 69 78 65 6c 73 2c 20 45 | 64 69 66 66 20 77 6f 6e |ixels, E|diff won|
|00001230| 27 74 20 77 61 72 70 20 | 6d 6f 75 73 65 20 69 6e |'t warp |mouse in|
|00001240| 74 6f 20 63 6f 6e 74 72 | 6f 6c 20 77 69 6e 64 6f |to contr|ol windo|
|00001250| 77 2e 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |w...(def|var edif|
|00001260| 66 2d 6d 6f 75 73 65 2d | 70 69 78 65 6c 2d 74 68 |f-mouse-|pixel-th|
|00001270| 72 65 73 68 6f 6c 64 20 | 33 30 20 28 23 24 20 2e |reshold |30 (#$ .|
|00001280| 20 34 35 39 35 29 29 0a | 23 40 32 33 31 20 2a 49 | 4595)).|#@231 *I|
|00001290| 66 20 74 2c 20 45 64 69 | 66 66 20 77 69 6c 6c 20 |f t, Edi|ff will |
|000012a0| 61 6c 77 61 79 73 20 67 | 72 61 62 20 74 68 65 20 |always g|rab the |
|000012b0| 6d 6f 75 73 65 20 61 6e | 64 20 70 75 74 20 69 74 |mouse an|d put it|
|000012c0| 20 69 6e 20 74 68 65 20 | 63 6f 6e 74 72 6f 6c 20 | in the |control |
|000012d0| 66 72 61 6d 65 2e 0a 49 | 66 20 27 6d 61 79 62 65 |frame..I|f 'maybe|
|000012e0| 2c 20 45 64 69 66 66 20 | 77 69 6c 6c 20 64 6f 20 |, Ediff |will do |
|000012f0| 69 74 20 73 6f 6d 65 74 | 69 6d 65 73 2c 20 62 75 |it somet|imes, bu|
|00001300| 74 20 6e 6f 74 20 61 66 | 74 65 72 20 6f 70 65 72 |t not af|ter oper|
|00001310| 61 74 69 6f 6e 73 20 74 | 68 61 74 20 72 65 71 75 |ations t|hat requ|
|00001320| 69 72 65 0a 72 65 6c 61 | 74 69 76 65 6c 79 20 6c |ire.rela|tively l|
|00001330| 6f 6e 67 20 74 69 6d 65 | 2e 20 49 66 20 6e 69 6c |ong time|. If nil|
|00001340| 2c 20 74 68 65 20 6d 6f | 75 73 65 20 77 69 6c 6c |, the mo|use will|
|00001350| 20 62 65 20 65 6e 74 69 | 72 65 6c 79 20 75 73 65 | be enti|rely use|
|00001360| 72 27 73 0a 72 65 73 70 | 6f 6e 73 69 62 69 6c 69 |r's.resp|onsibili|
|00001370| 74 79 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |ty...(de|fvar edi|
|00001380| 66 66 2d 67 72 61 62 2d | 6d 6f 75 73 65 20 74 20 |ff-grab-|mouse t |
|00001390| 28 23 24 20 2e 20 2d 34 | 37 35 30 29 29 0a 23 40 |(#$ . -4|750)).#@|
|000013a0| 32 35 36 20 46 75 6e 63 | 74 69 6f 6e 20 74 6f 20 |256 Func|tion to |
|000013b0| 63 61 6c 6c 20 74 6f 20 | 64 65 74 65 72 6d 69 6e |call to |determin|
|000013c0| 65 20 74 68 65 20 64 65 | 73 69 72 65 64 20 6c 6f |e the de|sired lo|
|000013d0| 63 61 74 69 6f 6e 20 66 | 6f 72 20 74 68 65 20 63 |cation f|or the c|
|000013e0| 6f 6e 74 72 6f 6c 20 70 | 61 6e 65 6c 2e 0a 45 78 |ontrol p|anel..Ex|
|000013f0| 70 65 63 74 73 20 74 68 | 72 65 65 20 70 61 72 61 |pects th|ree para|
|00001400| 6d 65 74 65 72 73 3a 20 | 74 68 65 20 63 6f 6e 74 |meters: |the cont|
|00001410| 72 6f 6c 20 62 75 66 66 | 65 72 2c 20 74 68 65 20 |rol buff|er, the |
|00001420| 64 65 73 69 72 65 64 20 | 77 69 64 74 68 20 61 6e |desired |width an|
|00001430| 64 20 68 65 69 67 68 74 | 0a 6f 66 20 74 68 65 20 |d height|.of the |
|00001440| 63 6f 6e 74 72 6f 6c 20 | 66 72 61 6d 65 2e 20 49 |control |frame. I|
|00001450| 74 20 72 65 74 75 72 6e | 73 20 61 6e 20 61 73 73 |t return|s an ass|
|00001460| 6f 63 69 61 74 69 6f 6e | 20 6c 69 73 74 0a 6f 66 |ociation| list.of|
|00001470| 20 74 68 65 20 66 6f 72 | 6d 20 28 28 74 6f 70 20 | the for|m ((top |
|00001480| 2e 20 3c 70 6f 73 69 74 | 69 6f 6e 3e 29 20 28 6c |. <posit|ion>) (l|
|00001490| 65 66 74 20 2e 20 3c 70 | 6f 73 69 74 69 6f 6e 3e |eft . <p|osition>|
|000014a0| 29 29 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |))..(def|var edif|
|000014b0| 66 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 2d |f-contro|l-frame-|
|000014c0| 70 6f 73 69 74 69 6f 6e | 2d 66 75 6e 63 74 69 6f |position|-functio|
|000014d0| 6e 20 28 71 75 6f 74 65 | 20 65 64 69 66 66 2d 6d |n (quote| ediff-m|
|000014e0| 61 6b 65 2d 66 72 61 6d | 65 2d 70 6f 73 69 74 69 |ake-fram|e-positi|
|000014f0| 6f 6e 29 20 28 23 24 20 | 2e 20 35 30 32 38 29 29 |on) (#$ |. 5028))|
|00001500| 0a 23 40 32 34 38 20 2a | 54 68 65 20 75 70 77 61 |.#@248 *|The upwa|
|00001510| 72 64 20 73 68 69 66 74 | 20 6f 66 20 63 6f 6e 74 |rd shift| of cont|
|00001520| 72 6f 6c 20 66 72 61 6d | 65 20 66 72 6f 6d 20 74 |rol fram|e from t|
|00001530| 68 65 20 74 6f 70 20 6f | 66 20 62 75 66 66 65 72 |he top o|f buffer|
|00001540| 20 41 27 73 20 66 72 61 | 6d 65 2e 0a 4d 65 61 73 | A's fra|me..Meas|
|00001550| 75 72 65 64 20 69 6e 20 | 70 69 78 65 6c 73 2e 0a |ured in |pixels..|
|00001560| 54 68 69 73 20 69 73 20 | 75 73 65 64 20 62 79 20 |This is |used by |
|00001570| 74 68 65 20 64 65 66 61 | 75 6c 74 20 63 6f 6e 74 |the defa|ult cont|
|00001580| 72 6f 6c 20 66 72 61 6d | 65 20 70 6f 73 69 74 69 |rol fram|e positi|
|00001590| 6f 6e 69 6e 67 20 66 75 | 6e 63 74 69 6f 6e 2c 0a |oning fu|nction,.|
|000015a0| 60 65 64 69 66 66 2d 6d | 61 6b 65 2d 66 72 61 6d |`ediff-m|ake-fram|
|000015b0| 65 2d 70 6f 73 69 74 69 | 6f 6e 27 2e 20 54 68 69 |e-positi|on'. Thi|
|000015c0| 73 20 76 61 72 69 61 62 | 6c 65 20 69 73 20 70 72 |s variab|le is pr|
|000015d0| 6f 76 69 64 65 64 20 66 | 6f 72 20 65 61 73 79 0a |ovided f|or easy.|
|000015e0| 63 75 73 74 6f 6d 69 7a | 61 74 69 6f 6e 20 6f 66 |customiz|ation of|
|000015f0| 20 74 68 65 20 64 65 66 | 61 75 6c 74 2e 1f 0a 28 | the def|ault...(|
|00001600| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 63 6f 6e |defvar e|diff-con|
|00001610| 74 72 6f 6c 2d 66 72 61 | 6d 65 2d 75 70 77 61 72 |trol-fra|me-upwar|
|00001620| 64 2d 73 68 69 66 74 20 | 28 62 79 74 65 2d 63 6f |d-shift |(byte-co|
|00001630| 64 65 20 22 08 83 06 00 | c1 87 c2 87 22 20 5b 65 |de "....|...." [e|
|00001640| 64 69 66 66 2d 78 65 6d | 61 63 73 2d 70 20 34 32 |diff-xem|acs-p 42|
|00001650| 20 31 34 5d 20 31 29 20 | 28 23 24 20 2e 20 2d 35 | 14] 1) |(#$ . -5|
|00001660| 33 38 33 29 29 0a 23 40 | 33 33 31 20 2a 54 68 65 |383)).#@|331 *The|
|00001670| 20 6c 65 66 74 77 61 72 | 64 20 73 68 69 66 74 20 | leftwar|d shift |
|00001680| 6f 66 20 63 6f 6e 74 72 | 6f 6c 20 66 72 61 6d 65 |of contr|ol frame|
|00001690| 20 66 72 6f 6d 20 74 68 | 65 20 72 69 67 68 74 20 | from th|e right |
|000016a0| 65 64 67 65 20 6f 66 20 | 62 75 66 20 41 27 73 20 |edge of |buf A's |
|000016b0| 66 72 61 6d 65 2e 0a 4d | 65 61 73 75 72 65 64 20 |frame..M|easured |
|000016c0| 69 6e 20 63 68 61 72 61 | 63 74 65 72 73 2e 0a 54 |in chara|cters..T|
|000016d0| 68 69 73 20 69 73 20 75 | 73 65 64 20 62 79 20 74 |his is u|sed by t|
|000016e0| 68 65 20 64 65 66 61 75 | 6c 74 20 63 6f 6e 74 72 |he defau|lt contr|
|000016f0| 6f 6c 20 66 72 61 6d 65 | 20 70 6f 73 69 74 69 6f |ol frame| positio|
|00001700| 6e 69 6e 67 20 66 75 6e | 63 74 69 6f 6e 2c 0a 60 |ning fun|ction,.`|
|00001710| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 66 72 61 6d 65 |ediff-ma|ke-frame|
|00001720| 2d 70 6f 73 69 74 69 6f | 6e 27 20 74 6f 20 61 64 |-positio|n' to ad|
|00001730| 6a 75 73 74 20 74 68 65 | 20 70 6f 73 69 74 69 6f |just the| positio|
|00001740| 6e 20 6f 66 20 74 68 65 | 20 63 6f 6e 74 72 6f 6c |n of the| control|
|00001750| 20 66 72 61 6d 65 0a 77 | 68 65 6e 20 69 74 20 73 | frame.w|hen it s|
|00001760| 68 6f 77 73 20 74 68 65 | 20 73 68 6f 72 74 20 6d |hows the| short m|
|00001770| 65 6e 75 2e 20 54 68 69 | 73 20 76 61 72 69 61 62 |enu. Thi|s variab|
|00001780| 6c 65 20 69 73 20 70 72 | 6f 76 69 64 65 64 20 66 |le is pr|ovided f|
|00001790| 6f 72 20 65 61 73 79 0a | 63 75 73 74 6f 6d 69 7a |or easy.|customiz|
|000017a0| 61 74 69 6f 6e 20 6f 66 | 20 74 68 65 20 64 65 66 |ation of| the def|
|000017b0| 61 75 6c 74 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |ault...(|defvar e|
|000017c0| 64 69 66 66 2d 6e 61 72 | 72 6f 77 2d 63 6f 6e 74 |diff-nar|row-cont|
|000017d0| 72 6f 6c 2d 66 72 61 6d | 65 2d 6c 65 66 74 77 61 |rol-fram|e-leftwa|
|000017e0| 72 64 2d 73 68 69 66 74 | 20 28 62 79 74 65 2d 63 |rd-shift| (byte-c|
|000017f0| 6f 64 65 20 22 08 83 06 | 00 c1 87 c2 87 22 20 5b |ode "...|....." [|
|00001800| 65 64 69 66 66 2d 78 65 | 6d 61 63 73 2d 70 20 37 |ediff-xe|macs-p 7|
|00001810| 20 33 5d 20 31 29 20 28 | 23 24 20 2e 20 2d 35 37 | 3] 1) (|#$ . -57|
|00001820| 34 30 29 29 0a 23 40 33 | 33 30 20 2a 54 68 65 20 |40)).#@3|30 *The |
|00001830| 72 69 67 68 74 77 61 72 | 64 20 73 68 69 66 74 20 |rightwar|d shift |
|00001840| 6f 66 20 63 6f 6e 74 72 | 6f 6c 20 66 72 61 6d 65 |of contr|ol frame|
|00001850| 20 66 72 6f 6d 20 74 68 | 65 20 6c 65 66 74 20 65 | from th|e left e|
|00001860| 64 67 65 20 6f 66 20 62 | 75 66 20 41 27 73 20 66 |dge of b|uf A's f|
|00001870| 72 61 6d 65 2e 0a 4d 65 | 61 73 75 72 65 64 20 69 |rame..Me|asured i|
|00001880| 6e 20 63 68 61 72 61 63 | 74 65 72 73 2e 0a 54 68 |n charac|ters..Th|
|00001890| 69 73 20 69 73 20 75 73 | 65 64 20 62 79 20 74 68 |is is us|ed by th|
|000018a0| 65 20 64 65 66 61 75 6c | 74 20 63 6f 6e 74 72 6f |e defaul|t contro|
|000018b0| 6c 20 66 72 61 6d 65 20 | 70 6f 73 69 74 69 6f 6e |l frame |position|
|000018c0| 69 6e 67 20 66 75 6e 63 | 74 69 6f 6e 2c 0a 60 65 |ing func|tion,.`e|
|000018d0| 64 69 66 66 2d 6d 61 6b | 65 2d 66 72 61 6d 65 2d |diff-mak|e-frame-|
|000018e0| 70 6f 73 69 74 69 6f 6e | 27 20 74 6f 20 61 64 6a |position|' to adj|
|000018f0| 75 73 74 20 74 68 65 20 | 70 6f 73 69 74 69 6f 6e |ust the |position|
|00001900| 20 6f 66 20 74 68 65 20 | 63 6f 6e 74 72 6f 6c 20 | of the |control |
|00001910| 66 72 61 6d 65 0a 77 68 | 65 6e 20 69 74 20 73 68 |frame.wh|en it sh|
|00001920| 6f 77 73 20 74 68 65 20 | 66 75 6c 6c 20 6d 65 6e |ows the |full men|
|00001930| 75 2e 20 54 68 69 73 20 | 76 61 72 69 61 62 6c 65 |u. This |variable|
|00001940| 20 69 73 20 70 72 6f 76 | 69 64 65 64 20 66 6f 72 | is prov|ided for|
|00001950| 20 65 61 73 79 0a 63 75 | 73 74 6f 6d 69 7a 61 74 | easy.cu|stomizat|
|00001960| 69 6f 6e 20 6f 66 20 74 | 68 65 20 64 65 66 61 75 |ion of t|he defau|
|00001970| 6c 74 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |lt...(de|fvar edi|
|00001980| 66 66 2d 77 69 64 65 2d | 63 6f 6e 74 72 6f 6c 2d |ff-wide-|control-|
|00001990| 66 72 61 6d 65 2d 72 69 | 67 68 74 77 61 72 64 2d |frame-ri|ghtward-|
|000019a0| 73 68 69 66 74 20 37 20 | 28 23 24 20 2e 20 2d 36 |shift 7 |(#$ . -6|
|000019b0| 31 38 37 29 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |187)).#@|2 ..(def|
|000019c0| 76 61 72 20 65 64 69 66 | 66 2d 77 69 64 65 2d 64 |var edif|f-wide-d|
|000019d0| 69 73 70 6c 61 79 2d 70 | 20 6e 69 6c 20 28 23 24 |isplay-p| nil (#$|
|000019e0| 20 2e 20 36 35 38 36 29 | 29 0a 28 62 79 74 65 2d | . 6586)|).(byte-|
|000019f0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00001a00| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00001a10| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00001a20| 69 66 66 2d 77 69 64 65 | 2d 64 69 73 70 6c 61 79 |iff-wide|-display|
|00001a30| 2d 70 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |-p put p|ermanent|
|00001a40| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 23 40 38 |-local t|] 4).#@8|
|00001a50| 35 20 46 72 61 6d 65 20 | 70 61 72 61 6d 65 74 65 |5 Frame |paramete|
|00001a60| 72 73 20 74 6f 20 62 65 | 20 72 65 73 74 6f 72 65 |rs to be| restore|
|00001a70| 64 20 77 68 65 6e 20 74 | 68 65 20 75 73 65 72 20 |d when t|he user |
|00001a80| 77 61 6e 74 73 20 74 6f | 20 74 6f 67 67 6c 65 20 |wants to| toggle |
|00001a90| 74 68 65 20 77 69 64 65 | 0a 64 69 73 70 6c 61 79 |the wide|.display|
|00001aa0| 20 6f 66 66 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 | off...(|defvar e|
|00001ab0| 64 69 66 66 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |diff-wid|e-displa|
|00001ac0| 79 2d 6f 72 69 67 2d 70 | 61 72 61 6d 65 74 65 72 |y-orig-p|arameter|
|00001ad0| 73 20 6e 69 6c 20 28 23 | 24 20 2e 20 36 37 33 38 |s nil (#|$ . 6738|
|00001ae0| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00001af0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00001b00| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00001b10| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 77 69 64 |-local e|diff-wid|
|00001b20| 65 2d 64 69 73 70 6c 61 | 79 2d 6f 72 69 67 2d 70 |e-displa|y-orig-p|
|00001b30| 61 72 61 6d 65 74 65 72 | 73 20 70 75 74 20 70 65 |arameter|s put pe|
|00001b40| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00001b50| 20 34 29 0a 23 40 33 36 | 20 46 72 61 6d 65 20 74 | 4).#@36| Frame t|
|00001b60| 6f 20 62 65 20 75 73 65 | 64 20 66 6f 72 20 77 69 |o be use|d for wi|
|00001b70| 64 65 20 64 69 73 70 6c | 61 79 2e 1f 0a 28 64 65 |de displ|ay...(de|
|00001b80| 66 76 61 72 20 65 64 69 | 66 66 2d 77 69 64 65 2d |fvar edi|ff-wide-|
|00001b90| 64 69 73 70 6c 61 79 2d | 66 72 61 6d 65 20 6e 69 |display-|frame ni|
|00001ba0| 6c 20 28 23 24 20 2e 20 | 37 30 30 31 29 29 0a 28 |l (#$ . |7001)).(|
|00001bb0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00001bc0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00001bd0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00001be0| 61 6c 20 65 64 69 66 66 | 2d 77 69 64 65 2d 64 69 |al ediff|-wide-di|
|00001bf0| 73 70 6c 61 79 2d 66 72 | 61 6d 65 20 70 75 74 20 |splay-fr|ame put |
|00001c00| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00001c10| 74 5d 20 34 29 0a 23 40 | 33 37 32 20 54 68 65 20 |t] 4).#@|372 The |
|00001c20| 76 61 6c 75 65 20 69 73 | 20 61 20 66 75 6e 63 74 |value is| a funct|
|00001c30| 69 6f 6e 20 74 68 61 74 | 20 69 73 20 63 61 6c 6c |ion that| is call|
|00001c40| 65 64 20 74 6f 20 63 72 | 65 61 74 65 20 61 20 77 |ed to cr|eate a w|
|00001c50| 69 64 65 20 64 69 73 70 | 6c 61 79 2e 0a 54 68 65 |ide disp|lay..The|
|00001c60| 20 66 75 6e 63 74 69 6f | 6e 20 69 73 20 63 61 6c | functio|n is cal|
|00001c70| 6c 65 64 20 77 69 74 68 | 6f 75 74 20 61 72 67 75 |led with|out argu|
|00001c80| 6d 65 6e 74 73 2e 20 49 | 74 20 73 68 6f 75 6c 64 |ments. I|t should|
|00001c90| 20 72 65 73 69 7a 65 20 | 74 68 65 20 66 72 61 6d | resize |the fram|
|00001ca0| 65 20 69 6e 0a 77 68 69 | 63 68 20 62 75 66 66 65 |e in.whi|ch buffe|
|00001cb0| 72 73 20 41 2c 20 42 2c | 20 61 6e 64 20 43 20 61 |rs A, B,| and C a|
|00001cc0| 72 65 20 74 6f 20 62 65 | 20 64 69 73 70 6c 61 79 |re to be| display|
|00001cd0| 65 64 2c 20 61 6e 64 20 | 69 74 20 73 68 6f 75 6c |ed, and |it shoul|
|00001ce0| 64 20 73 61 76 65 20 74 | 68 65 20 6f 6c 64 0a 66 |d save t|he old.f|
|00001cf0| 72 61 6d 65 20 70 61 72 | 61 6d 65 74 65 72 73 20 |rame par|ameters |
|00001d00| 69 6e 20 60 65 64 69 66 | 66 2d 77 69 64 65 2d 64 |in `edif|f-wide-d|
|00001d10| 69 73 70 6c 61 79 2d 6f | 72 69 67 2d 70 61 72 61 |isplay-o|rig-para|
|00001d20| 6d 65 74 65 72 73 27 2e | 0a 54 68 65 20 76 61 72 |meters'.|.The var|
|00001d30| 69 61 62 6c 65 20 60 65 | 64 69 66 66 2d 77 69 64 |iable `e|diff-wid|
|00001d40| 65 2d 64 69 73 70 6c 61 | 79 2d 66 72 61 6d 65 27 |e-displa|y-frame'|
|00001d50| 20 73 68 6f 75 6c 64 20 | 62 65 20 73 65 74 20 74 | should |be set t|
|00001d60| 6f 20 63 6f 6e 74 61 69 | 6e 0a 74 68 65 20 66 72 |o contai|n.the fr|
|00001d70| 61 6d 65 20 75 73 65 64 | 20 66 6f 72 20 74 68 65 |ame used| for the|
|00001d80| 20 77 69 64 65 20 64 69 | 73 70 6c 61 79 2e 1f 0a | wide di|splay...|
|00001d90| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 6d 61 |(defvar |ediff-ma|
|00001da0| 6b 65 2d 77 69 64 65 2d | 64 69 73 70 6c 61 79 2d |ke-wide-|display-|
|00001db0| 66 75 6e 63 74 69 6f 6e | 20 28 71 75 6f 74 65 20 |function| (quote |
|00001dc0| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 77 69 64 65 2d |ediff-ma|ke-wide-|
|00001dd0| 64 69 73 70 6c 61 79 29 | 20 28 23 24 20 2e 20 37 |display)| (#$ . 7|
|00001de0| 31 39 36 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |196)).(b|yte-code|
|00001df0| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00001e00| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00001e10| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00001e20| 6d 61 6b 65 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |make-wid|e-displa|
|00001e30| 79 2d 66 75 6e 63 74 69 | 6f 6e 20 70 75 74 20 70 |y-functi|on put p|
|00001e40| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00001e50| 5d 20 34 29 0a 23 40 32 | 20 1f 0a 28 64 65 66 76 |] 4).#@2| ..(defv|
|00001e60| 61 72 20 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |ar ediff|-control|
|00001e70| 2d 66 72 61 6d 65 20 6e | 69 6c 20 28 23 24 20 2e |-frame n|il (#$ .|
|00001e80| 20 37 37 36 39 29 29 0a | 28 62 79 74 65 2d 63 6f | 7769)).|(byte-co|
|00001e90| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00001ea0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00001eb0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00001ec0| 66 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 20 |f-contro|l-frame |
|00001ed0| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|00001ee0| 63 61 6c 20 74 5d 20 34 | 29 0a 23 40 34 33 34 20 |cal t] 4|).#@434 |
|00001ef0| 2a 49 66 20 74 2c 20 6b | 65 65 70 20 63 6f 6e 74 |*If t, k|eep cont|
|00001f00| 72 6f 6c 20 70 61 6e 65 | 6c 20 69 63 6f 6e 69 66 |rol pane|l iconif|
|00001f10| 69 65 64 20 77 68 65 6e | 20 68 65 6c 70 20 6d 65 |ied when| help me|
|00001f20| 73 73 61 67 65 20 69 73 | 20 6f 66 66 2e 0a 54 68 |ssage is| off..Th|
|00001f30| 69 73 20 68 61 73 20 65 | 66 66 65 63 74 20 6f 6e |is has e|ffect on|
|00001f40| 6c 79 20 6f 6e 20 61 20 | 77 69 6e 64 6f 77 69 6e |ly on a |windowin|
|00001f50| 67 20 73 79 73 74 65 6d | 2e 0a 49 66 20 74 2c 20 |g system|..If t, |
|00001f60| 68 69 74 74 69 6e 67 20 | 60 3f 27 20 74 6f 20 74 |hitting |`?' to t|
|00001f70| 6f 67 67 6c 65 20 63 6f | 6e 74 72 6f 6c 20 70 61 |oggle co|ntrol pa|
|00001f80| 6e 65 6c 20 6f 66 66 20 | 69 63 6f 6e 69 66 69 65 |nel off |iconifie|
|00001f90| 73 20 69 74 2e 0a 0a 54 | 68 69 73 20 69 73 20 6f |s it...T|his is o|
|00001fa0| 6e 6c 79 20 75 73 65 66 | 75 6c 20 69 6e 20 45 6d |nly usef|ul in Em|
|00001fb0| 61 63 73 20 61 6e 64 20 | 6f 6e 6c 79 20 66 6f 72 |acs and |only for|
|00001fc0| 20 63 65 72 74 61 69 6e | 20 6b 69 6e 64 73 20 6f | certain| kinds o|
|00001fd0| 66 20 77 69 6e 64 6f 77 | 20 6d 61 6e 61 67 65 72 |f window| manager|
|00001fe0| 73 2c 0a 73 75 63 68 20 | 61 73 20 54 57 4d 20 61 |s,.such |as TWM a|
|00001ff0| 6e 64 20 69 74 73 20 64 | 65 72 69 76 61 74 69 76 |nd its d|erivativ|
|00002000| 65 73 2c 20 73 69 6e 63 | 65 20 74 68 65 20 77 69 |es, sinc|e the wi|
|00002010| 6e 64 6f 77 20 6d 61 6e | 61 67 65 72 20 6d 75 73 |ndow man|ager mus|
|00002020| 74 20 70 65 72 6d 69 74 | 0a 6b 65 79 62 6f 61 72 |t permit|.keyboar|
|00002030| 64 20 69 6e 70 75 74 20 | 74 6f 20 67 6f 20 69 6e |d input |to go in|
|00002040| 74 6f 20 69 63 6f 6e 73 | 2e 20 58 45 6d 61 63 73 |to icons|. XEmacs|
|00002050| 20 63 6f 6d 70 6c 65 74 | 65 6c 79 20 69 67 6e 6f | complet|ely igno|
|00002060| 72 65 73 20 6b 65 79 62 | 6f 61 72 64 20 69 6e 70 |res keyb|oard inp|
|00002070| 75 74 0a 69 6e 74 6f 20 | 69 63 6f 6e 73 2c 20 72 |ut.into |icons, r|
|00002080| 65 67 61 72 64 6c 65 73 | 73 20 6f 66 20 74 68 65 |egardles|s of the|
|00002090| 20 77 69 6e 64 6f 77 20 | 6d 61 6e 61 67 65 72 2e | window |manager.|
|000020a0| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|000020b0| 70 72 65 66 65 72 2d 69 | 63 6f 6e 69 66 69 65 64 |prefer-i|conified|
|000020c0| 2d 63 6f 6e 74 72 6f 6c | 2d 66 72 61 6d 65 20 6e |-control|-frame n|
|000020d0| 69 6c 20 28 23 24 20 2e | 20 2d 37 39 32 30 29 29 |il (#$ .| -7920))|
|000020e0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000020f0| 66 2d 67 65 74 2d 77 69 | 6e 64 6f 77 2d 62 79 2d |f-get-wi|ndow-by-|
|00002100| 63 6c 69 63 6b 69 6e 67 | 20 23 5b 28 77 69 6e 64 |clicking| #[(wind|
|00002110| 20 70 72 65 76 2d 77 69 | 6e 64 20 77 69 6e 64 2d | prev-wi|nd wind-|
|00002120| 6e 75 6d 62 65 72 29 20 | 22 c0 19 c2 c3 5c 66 5c |number) |"....\f\|
|00002130| 22 88 c5 20 89 11 19 0e | 06 83 17 00 c7 09 21 82 |".. ....|......!.|
|00002140| 20 00 c8 c9 ca cb cc 09 | 21 5c 22 5c 22 29 84 36 | .......|!\"\").6|
|00002150| 00 cd ce 21 83 2e 00 cf | ce 21 88 c2 d0 5c 66 5c |...!....|.!...\f\|
|00002160| 22 88 82 07 00 c5 20 88 | 0e 06 83 44 00 d1 09 21 |"..... .|...D...!|
|00002170| 82 4f 00 09 89 19 41 40 | 29 89 1e 12 40 29 89 16 |.O....A@|)...@)..|
|00002180| 13 29 87 22 20 5b 6e 69 | 6c 20 65 76 65 6e 74 20 |.)." [ni|l event |
|00002190| 6d 65 73 73 61 67 65 20 | 22 53 65 6c 65 63 74 20 |message |"Select |
|000021a0| 77 69 6e 64 6f 77 73 20 | 62 79 20 63 6c 69 63 6b |windows |by click|
|000021b0| 69 6e 67 2e 20 50 6c 65 | 61 73 65 20 63 6c 69 63 |ing. Ple|ase clic|
|000021c0| 6b 20 6f 6e 20 57 69 6e | 64 6f 77 20 25 64 20 22 |k on Win|dow %d "|
|000021d0| 20 77 69 6e 64 2d 6e 75 | 6d 62 65 72 20 65 64 69 | wind-nu|mber edi|
|000021e0| 66 66 2d 72 65 61 64 2d | 65 76 65 6e 74 20 65 64 |ff-read-|event ed|
|000021f0| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 62 75 74 |iff-xema|cs-p but|
|00002200| 74 6f 6e 2d 65 76 65 6e | 74 2d 70 20 73 74 72 69 |ton-even|t-p stri|
|00002210| 6e 67 2d 6d 61 74 63 68 | 20 22 6d 6f 75 73 65 22 |ng-match| "mouse"|
|00002220| 20 66 6f 72 6d 61 74 20 | 22 25 53 22 20 65 76 65 | format |"%S" eve|
|00002230| 6e 74 2d 62 61 73 69 63 | 2d 74 79 70 65 20 73 69 |nt-basic|-type si|
|00002240| 74 2d 66 6f 72 20 31 20 | 62 65 65 70 20 22 50 6c |t-for 1 |beep "Pl|
|00002250| 65 61 73 65 20 63 6c 69 | 63 6b 20 6f 6e 20 57 69 |ease cli|ck on Wi|
|00002260| 6e 64 6f 77 20 25 64 20 | 22 20 65 76 65 6e 74 2d |ndow %d |" event-|
|00002270| 77 69 6e 64 6f 77 20 70 | 6f 73 69 74 69 6f 6e 20 |window p|osition |
|00002280| 77 69 6e 64 5d 20 37 5d | 29 0a 28 64 65 66 61 6c |wind] 7]|).(defal|
|00002290| 69 61 73 20 27 65 64 69 | 66 66 2d 73 65 6c 65 63 |ias 'edi|ff-selec|
|000022a0| 74 2d 6c 6f 77 65 73 74 | 2d 77 69 6e 64 6f 77 20 |t-lowest|-window |
|000022b0| 23 5b 6e 69 6c 20 22 08 | 83 09 00 c1 c2 20 21 87 |#[nil ".|..... !.|
|000022c0| c3 20 1c c5 20 41 41 41 | 40 1e 06 8a c7 c8 21 88 |. .. AAA|@.....!.|
|000022d0| c3 20 29 1e 09 ca 1e 0b | 0e 0b 85 5b 00 cc 20 1e |. ).....|...[.. .|
|000022e0| 0d c5 0e 0d 21 41 41 41 | 40 1e 0e 0e 06 0e 0e 57 |....!AAA|@......W|
|000022f0| 83 43 00 0e 0e 16 06 0e | 0d 14 c1 0e 0d 21 88 0e |.C......|.....!..|
|00002300| 09 0e 0d 3d 83 57 00 c1 | 5c 66 21 88 cf 16 0b 2a |...=.W..|\f!....*|
|00002310| 82 21 00 2c 87 22 20 5b | 65 64 69 66 66 2d 78 65 |.!.,." [|ediff-xe|
|00002320| 6d 61 63 73 2d 70 20 73 | 65 6c 65 63 74 2d 77 69 |macs-p s|elect-wi|
|00002330| 6e 64 6f 77 20 66 72 61 | 6d 65 2d 6c 6f 77 65 73 |ndow fra|me-lowes|
|00002340| 74 2d 77 69 6e 64 6f 77 | 20 73 65 6c 65 63 74 65 |t-window| selecte|
|00002350| 64 2d 77 69 6e 64 6f 77 | 20 6c 6f 77 65 73 74 2d |d-window| lowest-|
|00002360| 77 69 6e 64 6f 77 20 77 | 69 6e 64 6f 77 2d 65 64 |window w|indow-ed|
|00002370| 67 65 73 20 62 6f 74 74 | 6f 6d 2d 65 64 67 65 20 |ges bott|om-edge |
|00002380| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 20 2d 31 20 |other-wi|ndow -1 |
|00002390| 6c 61 73 74 2d 77 69 6e | 64 6f 77 20 74 20 77 69 |last-win|dow t wi|
|000023a0| 6e 64 6f 77 2d 73 65 61 | 72 63 68 20 6e 65 78 74 |ndow-sea|rch next|
|000023b0| 2d 77 69 6e 64 6f 77 20 | 74 68 69 73 2d 77 69 6e |-window |this-win|
|000023c0| 64 6f 77 20 6e 65 78 74 | 2d 62 6f 74 74 6f 6d 2d |dow next|-bottom-|
|000023d0| 65 64 67 65 20 6e 69 6c | 5d 20 32 5d 29 0a 28 64 |edge nil|] 2]).(d|
|000023e0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 73 |efalias |'ediff-s|
|000023f0| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 20 23 5b 28 |etup-win|dows #[(|
|00002400| 62 75 66 66 65 72 2d 41 | 20 62 75 66 66 65 72 2d |buffer-A| buffer-|
|00002410| 42 20 62 75 66 66 65 72 | 2d 43 20 63 6f 6e 74 72 |B buffer|-C contr|
|00002420| 6f 6c 2d 62 75 66 66 65 | 72 29 20 22 c0 c1 21 88 |ol-buffe|r) "..!.|
|00002430| c2 20 c3 20 3d 83 10 00 | c4 c5 21 88 c6 20 84 18 |. . =...|..!.. ..|
|00002440| 00 c7 16 08 c9 0e 5c 6e | 21 84 59 00 70 1e 0b 0e |......\n|!.Y.p...|
|00002450| 5c 6e 83 43 00 cc 0e 5c | 6e 21 83 43 00 cd cc 0e |\n.C...\|n!.C....|
|00002460| 5c 6e 21 21 83 43 00 ce | 8e 0e 5c 6e 71 88 0e 08 |\n!!.C..|..\nq...|
|00002470| 29 82 4e 00 0e 0f d0 3d | 86 4e 00 d1 0e 12 21 29 |).N....=|.N....!)|
|00002480| 0e 13 0e 14 0e 15 0e 5c | 6e 24 88 c0 d6 21 87 22 |.......\|n$...!."|
|00002490| 20 5b 72 75 6e 2d 68 6f | 6f 6b 73 20 65 64 69 66 | [run-ho|oks edif|
|000024a0| 66 2d 62 65 66 6f 72 65 | 2d 73 65 74 75 70 2d 77 |f-before|-setup-w|
|000024b0| 69 6e 64 6f 77 73 2d 68 | 6f 6f 6b 20 73 65 6c 65 |indows-h|ook sele|
|000024c0| 63 74 65 64 2d 77 69 6e | 64 6f 77 20 6d 69 6e 69 |cted-win|dow mini|
|000024d0| 62 75 66 66 65 72 2d 77 | 69 6e 64 6f 77 20 6f 74 |buffer-w|indow ot|
|000024e0| 68 65 72 2d 77 69 6e 64 | 6f 77 20 31 20 65 64 69 |her-wind|ow 1 edi|
|000024f0| 66 66 2d 77 69 6e 64 6f | 77 2d 64 69 73 70 6c 61 |ff-windo|w-displa|
|00002500| 79 2d 70 20 65 64 69 66 | 66 2d 73 65 74 75 70 2d |y-p edif|f-setup-|
|00002510| 77 69 6e 64 6f 77 73 2d | 70 6c 61 69 6e 20 65 64 |windows-|plain ed|
|00002520| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 73 65 74 75 70 |iff-wind|ow-setup|
|00002530| 2d 66 75 6e 63 74 69 6f | 6e 20 65 64 69 66 66 2d |-functio|n ediff-|
|00002540| 6b 65 65 70 2d 77 69 6e | 64 6f 77 2d 63 6f 6e 66 |keep-win|dow-conf|
|00002550| 69 67 20 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |ig contr|ol-buffe|
|00002560| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 20 67 65 |r StartB|uffer ge|
|00002570| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00002580| 6e 61 6d 65 20 28 28 73 | 65 74 2d 62 75 66 66 65 |name ((s|et-buffe|
|00002590| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|000025a0| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 65 64 69 |this-com|mand edi|
|000025b0| 66 66 2d 71 75 69 74 20 | 65 72 72 6f 72 20 65 64 |ff-quit |error ed|
|000025c0| 69 66 66 2d 4b 49 4c 4c | 45 44 2d 56 49 54 41 4c |iff-KILL|ED-VITAL|
|000025d0| 2d 42 55 46 46 45 52 20 | 62 75 66 66 65 72 2d 41 |-BUFFER |buffer-A|
|000025e0| 20 62 75 66 66 65 72 2d | 42 20 62 75 66 66 65 72 | buffer-|B buffer|
|000025f0| 2d 43 20 65 64 69 66 66 | 2d 61 66 74 65 72 2d 73 |-C ediff|-after-s|
|00002600| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 2d 68 6f 6f |etup-win|dows-hoo|
|00002610| 6b 5d 20 35 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |k] 5]).(|defalias|
|00002620| 20 27 65 64 69 66 66 2d | 73 65 74 75 70 2d 77 69 | 'ediff-|setup-wi|
|00002630| 6e 64 6f 77 73 2d 70 6c | 61 69 6e 20 23 5b 28 62 |ndows-pl|ain #[(b|
|00002640| 75 66 66 65 72 2d 41 20 | 62 75 66 66 65 72 2d 42 |uffer-A |buffer-B|
|00002650| 20 62 75 66 66 65 72 2d | 43 20 63 6f 6e 74 72 6f | buffer-|C contro|
|00002660| 6c 2d 62 75 66 66 65 72 | 29 20 22 70 18 09 83 20 |l-buffer|) "p... |
|00002670| 00 c2 09 21 83 20 00 c3 | c2 09 21 21 83 20 00 c4 |...!. ..|..!!. ..|
|00002680| 8e 09 71 88 c5 16 06 29 | 82 2c 00 0e 07 c8 3d 84 |..q....)|.,....=.|
|00002690| 2c 00 c9 0e 5c 6e 21 88 | 29 0e 0b 83 3c 00 cc 0e |,...\n!.|)...<...|
|000026a0| 0d 0e 0e 0e 0f 09 24 87 | d0 0e 0d 0e 0e 0e 0f 09 |......$.|........|
|000026b0| 24 87 22 20 5b 53 74 61 | 72 74 42 75 66 66 65 72 |$." [Sta|rtBuffer|
|000026c0| 20 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 20 | control|-buffer |
|000026d0| 67 65 74 2d 62 75 66 66 | 65 72 20 62 75 66 66 65 |get-buff|er buffe|
|000026e0| 72 2d 6e 61 6d 65 20 28 | 28 73 65 74 2d 62 75 66 |r-name (|(set-buf|
|000026f0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|00002700| 29 20 6e 69 6c 20 65 64 | 69 66 66 2d 6d 75 6c 74 |) nil ed|iff-mult|
|00002710| 69 66 72 61 6d 65 20 74 | 68 69 73 2d 63 6f 6d 6d |iframe t|his-comm|
|00002720| 61 6e 64 20 65 64 69 66 | 66 2d 71 75 69 74 20 65 |and edif|f-quit e|
|00002730| 72 72 6f 72 20 65 64 69 | 66 66 2d 4b 49 4c 4c 45 |rror edi|ff-KILLE|
|00002740| 44 2d 56 49 54 41 4c 2d | 42 55 46 46 45 52 20 65 |D-VITAL-|BUFFER e|
|00002750| 64 69 66 66 2d 6d 65 72 | 67 65 2d 6a 6f 62 20 65 |diff-mer|ge-job e|
|00002760| 64 69 66 66 2d 73 65 74 | 75 70 2d 77 69 6e 64 6f |diff-set|up-windo|
|00002770| 77 73 2d 70 6c 61 69 6e | 2d 6d 65 72 67 65 20 62 |ws-plain|-merge b|
|00002780| 75 66 66 65 72 2d 41 20 | 62 75 66 66 65 72 2d 42 |uffer-A |buffer-B|
|00002790| 20 62 75 66 66 65 72 2d | 43 20 65 64 69 66 66 2d | buffer-|C ediff-|
|000027a0| 73 65 74 75 70 2d 77 69 | 6e 64 6f 77 73 2d 70 6c |setup-wi|ndows-pl|
|000027b0| 61 69 6e 2d 63 6f 6d 70 | 61 72 65 5d 20 35 5d 29 |ain-comp|are] 5])|
|000027c0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000027d0| 66 2d 73 65 74 75 70 2d | 77 69 6e 64 6f 77 73 2d |f-setup-|windows-|
|000027e0| 70 6c 61 69 6e 2d 6d 65 | 72 67 65 20 23 5b 28 62 |plain-me|rge #[(b|
|000027f0| 75 66 2d 41 20 62 75 66 | 2d 42 20 62 75 66 2d 43 |uf-A buf|-B buf-C|
|00002800| 20 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 29 | control|-buffer)|
|00002810| 20 22 c0 09 21 88 c2 c3 | 89 89 89 89 89 1c 1d 1e | "..!...|........|
|00002820| 06 1e 07 1e 08 1e 09 1e | 5c 6e 70 1e 0b 09 83 3d |........|\np....=|
|00002830| 00 cc 09 21 83 3d 00 cd | cc 09 21 21 83 3d 00 ce |...!.=..|..!!.=..|
|00002840| 8e 09 71 88 0e 0f 16 08 | 0e 10 16 09 29 82 49 00 |..q.....|....).I.|
|00002850| 0e 11 d2 3d 84 49 00 d3 | 0e 14 21 88 29 d5 20 88 |...=.I..|..!.). .|
|00002860| d6 20 88 d7 20 88 d8 09 | 21 88 d9 c2 21 88 da db |. .. ...|!...!...|
|00002870| dc 20 0e 08 5f 21 5d 16 | 07 dd 0e 1e 21 88 df 20 |. .._!].|....!.. |
|00002880| 16 06 d6 da dc 20 0e 07 | 5a 5d 21 88 df 20 0e 06 |..... ..|Z]!.. ..|
|00002890| 3d 83 85 00 d9 c2 21 88 | df 20 14 dd 0e 20 21 88 |=.....!.|. ... !.|
|000028a0| e1 0e 06 21 88 0e 09 20 | 88 df 20 0e 06 3d 83 a2 |...!... |.. ..=..|
|000028b0| 00 d9 c2 21 88 dd 0e 5c | 22 21 88 df 20 15 70 1e |...!...\|"!.. .p.|
|000028c0| 0b 09 83 d2 00 cc 09 21 | 83 d2 00 cd cc 09 21 21 |.......!|......!!|
|000028d0| 83 d2 00 e3 8e 09 71 88 | 0e 06 16 24 0d 16 25 5c |......q.|...$..%\|
|000028e0| 66 16 26 29 82 de 00 0e | 11 d2 3d 84 de 00 d3 0e |f.&)....|..=.....|
|000028f0| 14 21 88 29 d7 20 88 d8 | 09 21 2e 07 87 22 20 5b |.!.). ..|.!..." [|
|00002900| 65 64 69 66 66 2d 64 65 | 73 74 72 6f 79 2d 63 6f |ediff-de|stroy-co|
|00002910| 6e 74 72 6f 6c 2d 66 72 | 61 6d 65 20 63 6f 6e 74 |ntrol-fr|ame cont|
|00002920| 72 6f 6c 2d 62 75 66 66 | 65 72 20 31 20 6e 69 6c |rol-buff|er 1 nil|
|00002930| 20 77 69 6e 64 2d 43 20 | 77 69 6e 64 2d 42 20 77 | wind-C |wind-B w|
|00002940| 69 6e 64 2d 41 20 6d 65 | 72 67 65 2d 77 69 6e 64 |ind-A me|rge-wind|
|00002950| 6f 77 2d 6c 69 6e 65 73 | 20 6d 65 72 67 65 2d 77 |ow-lines| merge-w|
|00002960| 69 6e 64 6f 77 2d 73 68 | 61 72 65 20 73 70 6c 69 |indow-sh|are spli|
|00002970| 74 2d 77 69 6e 64 6f 77 | 2d 66 75 6e 63 74 69 6f |t-window|-functio|
|00002980| 6e 20 77 69 6e 64 6f 77 | 2d 6d 69 6e 2d 68 65 69 |n window|-min-hei|
|00002990| 67 68 74 20 53 74 61 72 | 74 42 75 66 66 65 72 20 |ght Star|tBuffer |
|000029a0| 67 65 74 2d 62 75 66 66 | 65 72 20 62 75 66 66 65 |get-buff|er buffe|
|000029b0| 72 2d 6e 61 6d 65 20 28 | 28 73 65 74 2d 62 75 66 |r-name (|(set-buf|
|000029c0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|000029d0| 29 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 |) ediff-|merge-wi|
|000029e0| 6e 64 6f 77 2d 73 68 61 | 72 65 20 65 64 69 66 66 |ndow-sha|re ediff|
|000029f0| 2d 73 70 6c 69 74 2d 77 | 69 6e 64 6f 77 2d 66 75 |-split-w|indow-fu|
|00002a00| 6e 63 74 69 6f 6e 20 74 | 68 69 73 2d 63 6f 6d 6d |nction t|his-comm|
|00002a10| 61 6e 64 20 65 64 69 66 | 66 2d 71 75 69 74 20 65 |and edif|f-quit e|
|00002a20| 72 72 6f 72 20 65 64 69 | 66 66 2d 4b 49 4c 4c 45 |rror edi|ff-KILLE|
|00002a30| 44 2d 56 49 54 41 4c 2d | 42 55 46 46 45 52 20 64 |D-VITAL-|BUFFER d|
|00002a40| 65 6c 65 74 65 2d 6f 74 | 68 65 72 2d 77 69 6e 64 |elete-ot|her-wind|
|00002a50| 6f 77 73 20 73 70 6c 69 | 74 2d 77 69 6e 64 6f 77 |ows spli|t-window|
|00002a60| 2d 76 65 72 74 69 63 61 | 6c 6c 79 20 65 64 69 66 |-vertica|lly edif|
|00002a70| 66 2d 73 65 6c 65 63 74 | 2d 6c 6f 77 65 73 74 2d |f-select|-lowest-|
|00002a80| 77 69 6e 64 6f 77 20 65 | 64 69 66 66 2d 73 65 74 |window e|diff-set|
|00002a90| 75 70 2d 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |up-contr|ol-buffe|
|00002aa0| 72 20 6f 74 68 65 72 2d | 77 69 6e 64 6f 77 20 32 |r other-|window 2|
|00002ab0| 20 72 6f 75 6e 64 20 77 | 69 6e 64 6f 77 2d 68 65 | round w|indow-he|
|00002ac0| 69 67 68 74 20 73 77 69 | 74 63 68 2d 74 6f 2d 62 |ight swi|tch-to-b|
|00002ad0| 75 66 66 65 72 20 62 75 | 66 2d 41 20 73 65 6c 65 |uffer bu|f-A sele|
|00002ae0| 63 74 65 64 2d 77 69 6e | 64 6f 77 20 62 75 66 2d |cted-win|dow buf-|
|00002af0| 43 20 73 65 6c 65 63 74 | 2d 77 69 6e 64 6f 77 20 |C select|-window |
|00002b00| 62 75 66 2d 42 20 28 28 | 73 65 74 2d 62 75 66 66 |buf-B ((|set-buff|
|00002b10| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00002b20| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 41 20 | ediff-w|indow-A |
|00002b30| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 42 20 65 |ediff-wi|ndow-B e|
|00002b40| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 43 5d 20 37 |diff-win|dow-C] 7|
|00002b50| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00002b60| 69 66 66 2d 73 65 74 75 | 70 2d 77 69 6e 64 6f 77 |iff-setu|p-window|
|00002b70| 73 2d 70 6c 61 69 6e 2d | 63 6f 6d 70 61 72 65 20 |s-plain-|compare |
|00002b80| 23 5b 28 62 75 66 2d 41 | 20 62 75 66 2d 42 20 62 |#[(buf-A| buf-B b|
|00002b90| 75 66 2d 43 20 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |uf-C con|trol-buf|
|00002ba0| 66 65 72 29 20 22 c0 09 | 21 88 c2 c3 89 89 89 89 |fer) "..|!.......|
|00002bb0| 89 89 89 1c 1d 1e 06 1e | 07 1e 08 1e 09 1e 5c 6e |........|......\n|
|00002bc0| 1e 0b 1e 5c 66 70 1e 0d | 09 83 52 00 ce 09 21 83 |...\fp..|..R...!.|
|00002bd0| 52 00 cf ce 09 21 21 83 | 52 00 d0 8e 09 71 88 d1 |R....!!.|R....q..|
|00002be0| 0e 12 40 21 16 08 d1 0e | 12 41 40 21 16 07 0e 13 |..@!....|.A@!....|
|00002bf0| 16 0b 0e 14 16 09 29 82 | 5e 00 0e 15 d6 3d 84 5e |......).|^....=.^|
|00002c00| 00 d7 0e 18 21 88 29 d9 | 20 88 da 20 88 db 20 88 |....!.).| .. .. .|
|00002c10| dc 09 21 88 dd c2 21 88 | de 0e 1f 21 88 e0 20 16 |..!...!.|...!.. .|
|00002c20| 06 0e 09 83 94 00 0e 0b | da 3d 83 8c 00 e1 0e 06 |........|.=......|
|00002c30| 21 82 90 00 e2 0e 06 21 | e3 a5 16 5c 6e 0e 0b 0e |!......!|...\n...|
|00002c40| 5c 6e 21 88 e0 20 0e 06 | 3d 83 a6 00 dd c2 21 88 |\n!.. ..|=.....!.|
|00002c50| de 0e 24 21 88 e0 20 15 | 0e 09 83 ca 00 0e 0b 20 |..$!.. .|....... |
|00002c60| 88 e0 20 0d 3d 83 c2 00 | dd c2 21 88 de 0e 25 21 |.. .=...|..!...%!|
|00002c70| 88 e0 20 14 70 1e 0d 09 | 83 f2 00 ce 09 21 83 f2 |.. .p...|.....!..|
|00002c80| 00 cf ce 09 21 21 83 f2 | 00 e6 8e 09 71 88 0e 06 |....!!..|....q...|
|00002c90| 16 27 0d 16 28 5c 66 16 | 29 29 82 fe 00 0e 15 d6 |.'..(\f.|))......|
|00002ca0| 3d 84 fe 00 d7 0e 18 21 | 88 29 0e 2a 83 11 01 eb |=......!|.).*....|
|00002cb0| 0e 06 0e 08 5c 22 88 eb | 0d 0e 07 5c 22 88 db 20 |....\"..|...\".. |
|00002cc0| 88 dc 09 21 2e 09 87 22 | 20 5b 65 64 69 66 66 2d |...!..."| [ediff-|
|00002cd0| 64 65 73 74 72 6f 79 2d | 63 6f 6e 74 72 6f 6c 2d |destroy-|control-|
|00002ce0| 66 72 61 6d 65 20 63 6f | 6e 74 72 6f 6c 2d 62 75 |frame co|ntrol-bu|
|00002cf0| 66 66 65 72 20 31 20 6e | 69 6c 20 77 69 6e 64 2d |ffer 1 n|il wind-|
|00002d00| 43 20 77 69 6e 64 2d 42 | 20 77 69 6e 64 2d 41 20 |C wind-B| wind-A |
|00002d10| 77 69 6e 64 2d 42 2d 73 | 74 61 72 74 20 77 69 6e |wind-B-s|tart win|
|00002d20| 64 2d 41 2d 73 74 61 72 | 74 20 74 68 72 65 65 2d |d-A-star|t three-|
|00002d30| 77 61 79 2d 63 6f 6d 70 | 61 72 69 73 6f 6e 20 77 |way-comp|arison w|
|00002d40| 69 6e 64 2d 77 69 64 74 | 68 2d 6f 72 2d 68 65 69 |ind-widt|h-or-hei|
|00002d50| 67 68 74 20 73 70 6c 69 | 74 2d 77 69 6e 64 6f 77 |ght spli|t-window|
|00002d60| 2d 66 75 6e 63 74 69 6f | 6e 20 77 69 6e 64 6f 77 |-functio|n window|
|00002d70| 2d 6d 69 6e 2d 68 65 69 | 67 68 74 20 53 74 61 72 |-min-hei|ght Star|
|00002d80| 74 42 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |tBuffer |get-buff|
|00002d90| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 28 |er buffe|r-name (|
|00002da0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00002db0| 74 42 75 66 66 65 72 29 | 29 20 65 64 69 66 66 2d |tBuffer)|) ediff-|
|00002dc0| 6f 76 65 72 6c 61 79 2d | 73 74 61 72 74 20 65 64 |overlay-|start ed|
|00002dd0| 69 66 66 2d 6e 61 72 72 | 6f 77 2d 62 6f 75 6e 64 |iff-narr|ow-bound|
|00002de0| 73 20 65 64 69 66 66 2d | 73 70 6c 69 74 2d 77 69 |s ediff-|split-wi|
|00002df0| 6e 64 6f 77 2d 66 75 6e | 63 74 69 6f 6e 20 65 64 |ndow-fun|ction ed|
|00002e00| 69 66 66 2d 33 77 61 79 | 2d 63 6f 6d 70 61 72 69 |iff-3way|-compari|
|00002e10| 73 6f 6e 2d 6a 6f 62 20 | 74 68 69 73 2d 63 6f 6d |son-job |this-com|
|00002e20| 6d 61 6e 64 20 65 64 69 | 66 66 2d 71 75 69 74 20 |mand edi|ff-quit |
|00002e30| 65 72 72 6f 72 20 65 64 | 69 66 66 2d 4b 49 4c 4c |error ed|iff-KILL|
|00002e40| 45 44 2d 56 49 54 41 4c | 2d 42 55 46 46 45 52 20 |ED-VITAL|-BUFFER |
|00002e50| 64 65 6c 65 74 65 2d 6f | 74 68 65 72 2d 77 69 6e |delete-o|ther-win|
|00002e60| 64 6f 77 73 20 73 70 6c | 69 74 2d 77 69 6e 64 6f |dows spl|it-windo|
|00002e70| 77 2d 76 65 72 74 69 63 | 61 6c 6c 79 20 65 64 69 |w-vertic|ally edi|
|00002e80| 66 66 2d 73 65 6c 65 63 | 74 2d 6c 6f 77 65 73 74 |ff-selec|t-lowest|
|00002e90| 2d 77 69 6e 64 6f 77 20 | 65 64 69 66 66 2d 73 65 |-window |ediff-se|
|00002ea0| 74 75 70 2d 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |tup-cont|rol-buff|
|00002eb0| 65 72 20 6f 74 68 65 72 | 2d 77 69 6e 64 6f 77 20 |er other|-window |
|00002ec0| 73 77 69 74 63 68 2d 74 | 6f 2d 62 75 66 66 65 72 |switch-t|o-buffer|
|00002ed0| 20 62 75 66 2d 41 20 73 | 65 6c 65 63 74 65 64 2d | buf-A s|elected-|
|00002ee0| 77 69 6e 64 6f 77 20 77 | 69 6e 64 6f 77 2d 68 65 |window w|indow-he|
|00002ef0| 69 67 68 74 20 77 69 6e | 64 6f 77 2d 77 69 64 74 |ight win|dow-widt|
|00002f00| 68 20 33 20 62 75 66 2d | 42 20 62 75 66 2d 43 20 |h 3 buf-|B buf-C |
|00002f10| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00002f20| 72 74 42 75 66 66 65 72 | 29 29 20 65 64 69 66 66 |rtBuffer|)) ediff|
|00002f30| 2d 77 69 6e 64 6f 77 2d | 41 20 65 64 69 66 66 2d |-window-|A ediff-|
|00002f40| 77 69 6e 64 6f 77 2d 42 | 20 65 64 69 66 66 2d 77 |window-B| ediff-w|
|00002f50| 69 6e 64 6f 77 2d 43 20 | 65 64 69 66 66 2d 77 69 |indow-C |ediff-wi|
|00002f60| 6e 64 6f 77 73 2d 6a 6f | 62 20 73 65 74 2d 77 69 |ndows-jo|b set-wi|
|00002f70| 6e 64 6f 77 2d 73 74 61 | 72 74 5d 20 39 5d 29 0a |ndow-sta|rt] 9]).|
|00002f80| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00002f90| 2d 73 65 74 75 70 2d 77 | 69 6e 64 6f 77 73 2d 6d |-setup-w|indows-m|
|00002fa0| 75 6c 74 69 66 72 61 6d | 65 20 23 5b 28 62 75 66 |ultifram|e #[(buf|
|00002fb0| 2d 41 20 62 75 66 2d 42 | 20 62 75 66 2d 43 20 63 |-A buf-B| buf-C c|
|00002fc0| 6f 6e 74 72 6f 6c 2d 62 | 75 66 29 20 22 70 18 09 |ontrol-b|uf) "p..|
|00002fd0| 83 20 00 c2 09 21 83 20 | 00 c3 c2 09 21 21 83 20 |. ...!. |....!!. |
|00002fe0| 00 c4 8e 09 71 88 c5 16 | 06 29 82 2c 00 0e 07 c8 |....q...|.).,....|
|00002ff0| 3d 84 2c 00 c9 0e 5c 6e | 21 88 29 0e 0b 83 3c 00 |=.,...\n|!.)...<.|
|00003000| cc 0e 0d 0e 0e 0e 0f 09 | 24 87 d0 0e 0d 0e 0e 0e |........|$.......|
|00003010| 0f 09 24 87 22 20 5b 53 | 74 61 72 74 42 75 66 66 |..$." [S|tartBuff|
|00003020| 65 72 20 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 20 67 |er contr|ol-buf g|
|00003030| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00003040| 2d 6e 61 6d 65 20 28 28 | 73 65 74 2d 62 75 66 66 |-name ((|set-buff|
|00003050| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00003060| 20 74 20 65 64 69 66 66 | 2d 6d 75 6c 74 69 66 72 | t ediff|-multifr|
|00003070| 61 6d 65 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |ame this|-command|
|00003080| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|00003090| 72 20 65 64 69 66 66 2d | 4b 49 4c 4c 45 44 2d 56 |r ediff-|KILLED-V|
|000030a0| 49 54 41 4c 2d 42 55 46 | 46 45 52 20 65 64 69 66 |ITAL-BUF|FER edif|
|000030b0| 66 2d 6d 65 72 67 65 2d | 6a 6f 62 20 65 64 69 66 |f-merge-|job edif|
|000030c0| 66 2d 73 65 74 75 70 2d | 77 69 6e 64 6f 77 73 2d |f-setup-|windows-|
|000030d0| 6d 75 6c 74 69 66 72 61 | 6d 65 2d 6d 65 72 67 65 |multifra|me-merge|
|000030e0| 20 62 75 66 2d 41 20 62 | 75 66 2d 42 20 62 75 66 | buf-A b|uf-B buf|
|000030f0| 2d 43 20 65 64 69 66 66 | 2d 73 65 74 75 70 2d 77 |-C ediff|-setup-w|
|00003100| 69 6e 64 6f 77 73 2d 6d | 75 6c 74 69 66 72 61 6d |indows-m|ultifram|
|00003110| 65 2d 63 6f 6d 70 61 72 | 65 5d 20 35 5d 29 0a 28 |e-compar|e] 5]).(|
|00003120| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00003130| 73 65 74 75 70 2d 77 69 | 6e 64 6f 77 73 2d 6d 75 |setup-wi|ndows-mu|
|00003140| 6c 74 69 66 72 61 6d 65 | 2d 6d 65 72 67 65 20 23 |ltiframe|-merge #|
|00003150| 5b 28 62 75 66 2d 41 20 | 62 75 66 2d 42 20 62 75 |[(buf-A |buf-B bu|
|00003160| 66 2d 43 20 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 29 |f-C cont|rol-buf)|
|00003170| 20 22 c0 c1 21 88 c2 1b | c4 0d 21 1e 06 c4 0e 07 | "..!...|..!.....|
|00003180| 21 1e 08 c4 0e 09 21 1e | 5c 6e 0e 06 85 20 00 cb |!.....!.|\n... ..|
|00003190| 0e 06 21 1e 5c 66 0e 08 | 85 2b 00 cb 0e 08 21 1e |..!.\f..|.+....!.|
|000031a0| 0d 0e 5c 6e 85 36 00 cb | 0e 5c 6e 21 1e 0e 70 1e |..\n.6..|.\n!..p.|
|000031b0| 0f 0e 10 83 5c 5c 00 d1 | 0e 10 21 83 5c 5c 00 d2 |....\\..|..!.\\..|
|000031c0| d1 0e 10 21 21 83 5c 5c | 00 d3 8e 0e 10 71 88 0e |...!!.\\|.....q..|
|000031d0| 14 29 82 67 00 0e 15 d6 | 3d 86 67 00 d7 0e 18 21 |.).g....|=.g....!|
|000031e0| 29 1e 19 70 1e 0f 0e 10 | 83 8e 00 d1 0e 10 21 83 |)..p....|......!.|
|000031f0| 8e 00 d2 d1 0e 10 21 21 | 83 8e 00 da 8e 0e 10 71 |......!!|.......q|
|00003200| 88 0e 1b 29 82 99 00 0e | 15 d6 3d 86 99 00 d7 0e |...)....|..=.....|
|00003210| 18 21 29 1e 1c dd 20 1e | 1e df 20 1e 20 0e 19 86 |.!)... .|.. . ...|
|00003220| f0 00 0e 5c 66 0e 0e 86 | b2 00 0e 20 3d 86 f0 00 |...\f...|... =...|
|00003230| 0e 0d 0e 0e 86 bf 00 0e | 20 3d 86 f0 00 e1 0e 5c |........| =.....\|
|00003240| 66 21 3f 86 f0 00 e1 0e | 0d 21 3f 86 f0 00 e2 0e |f!?.....|.!?.....|
|00003250| 06 21 3f 86 f0 00 e2 0e | 08 21 3f 86 f0 00 0e 5c |.!?.....|.!?....\|
|00003260| 66 0e 0d 3d 85 f0 00 e1 | 0e 0e 21 3f 89 1e 23 3f |f..=....|..!?..#?|
|00003270| 85 fc 00 0e 5c 66 0e 0d | 3d 1e 24 70 1e 0f 0e 10 |....\f..|=.$p....|
|00003280| 83 5c 22 01 d1 0e 10 21 | 83 5c 22 01 d2 d1 0e 10 |.\"....!|.\".....|
|00003290| 21 21 83 5c 22 01 e5 8e | 0e 10 71 88 0e 26 29 82 |!!.\"...|..q..&).|
|000032a0| 2d 01 0e 15 d6 3d 86 2d | 01 d7 0e 18 21 29 1e 27 |-....=.-|....!).'|
|000032b0| e8 1e 29 e8 1e 2a e8 1e | 2b e8 1e 2c e8 1e 2d ee |..)..*..|+..,..-.|
|000032c0| 0e 06 21 83 5f 01 0e 23 | 84 5f 01 0e 24 84 5f 01 |..!._..#|._..$._.|
|000032d0| ef 0e 06 21 88 f0 20 88 | dd 20 16 06 f1 16 2b ee |...!.. .|. ....+.|
|000032e0| 0e 08 21 83 7f 01 0e 23 | 84 7f 01 0e 24 84 7f 01 |..!....#|....$...|
|000032f0| ef 0e 08 21 88 f0 20 88 | dd 20 16 08 f1 16 2c ee |...!.. .|. ....,.|
|00003300| 0e 5c 6e 21 83 a1 01 e2 | 0e 5c 6e 21 83 a1 01 0e |.\n!....|.\n!....|
|00003310| 23 84 a1 01 ef 0e 5c 6e | 21 88 f0 20 88 dd 20 16 |#.....\n|!.. .. .|
|00003320| 5c 6e f1 16 2d 0e 24 83 | d8 01 ee 0e 06 21 83 d8 |\n..-.$.|.....!..|
|00003330| 01 ef 0e 06 21 88 f0 20 | 88 dd 20 16 06 0e 1c 20 |....!.. |.. .... |
|00003340| 88 dd 20 0e 06 3d 83 c9 | 01 f2 c2 21 88 f3 0e 07 |.. ..=..|...!....|
|00003350| 21 88 dd 20 16 08 f1 16 | 2b f1 16 2c 0e 23 83 3f |!.. ....|+..,.#.?|
|00003360| 02 c2 1b c0 20 88 f0 20 | 88 f4 f5 f6 20 0e 27 5f |.... .. |.... .'_|
|00003370| 21 5d 16 29 f3 0d 21 88 | dd 20 16 06 f7 f4 f6 20 |!].)..!.|. ..... |
|00003380| 0e 29 5a 5d 21 88 dd 20 | 0e 06 3d 83 0e 02 f2 c2 |.)Z]!.. |..=.....|
|00003390| 21 88 dd 20 16 5c 6e f3 | 0e 09 21 88 ef 0e 06 21 |!.. .\n.|..!....!|
|000033a0| 88 0e 1c 20 88 dd 20 0e | 06 3d 83 2c 02 f2 c2 21 |... .. .|.=.,...!|
|000033b0| 88 f3 0e 07 21 88 dd 20 | 16 08 f1 16 2b f1 16 2c |....!.. |....+..,|
|000033c0| f1 16 2d 29 0e 2b 84 54 | 02 ef 0e 1e 21 88 f0 20 |..-).+.T|....!.. |
|000033d0| 88 f3 0d 21 88 dd 20 16 | 06 0e 2c 84 6a 02 ef 0e |...!.. .|..,.j...|
|000033e0| 1e 21 88 f0 20 88 f3 0e | 07 21 88 dd 20 16 08 0e |.!.. ...|.!.. ...|
|000033f0| 2d 84 80 02 ef 0e 1e 21 | 88 f0 20 88 f3 0e 09 21 |-......!|.. ....!|
|00003400| 88 dd 20 16 5c 6e 70 1e | 0f 0e 10 83 bc 02 d1 0e |.. .\np.|........|
|00003410| 10 21 83 bc 02 d2 d1 0e | 10 21 21 83 bc 02 f8 8e |.!......|.!!.....|
|00003420| 0e 10 71 88 0e 06 16 39 | 0e 08 16 3a 0e 5c 6e 16 |..q....9|...:.\n.|
|00003430| 3b cb 0e 39 21 16 5c 66 | cb fc 0e 5c 66 21 21 16 |;..9!.\f|...\f!!.|
|00003440| 2a 29 82 c8 02 0e 15 d6 | 3d 84 c8 02 d7 0e 18 21 |*)......|=......!|
|00003450| 88 29 fd 0e 10 0e 2a 5c | 22 2e 13 87 22 20 5b 65 |.)....*\|"..." [e|
|00003460| 64 69 66 66 2d 73 6b 69 | 70 2d 75 6e 73 75 69 74 |diff-ski|p-unsuit|
|00003470| 61 62 6c 65 2d 66 72 61 | 6d 65 73 20 6f 6b 2d 75 |able-fra|mes ok-u|
|00003480| 6e 73 70 6c 69 74 74 61 | 62 6c 65 20 31 20 77 69 |nsplitta|ble 1 wi|
|00003490| 6e 64 6f 77 2d 6d 69 6e | 2d 68 65 69 67 68 74 20 |ndow-min|-height |
|000034a0| 65 64 69 66 66 2d 67 65 | 74 2d 76 69 73 69 62 6c |ediff-ge|t-visibl|
|000034b0| 65 2d 62 75 66 66 65 72 | 2d 77 69 6e 64 6f 77 20 |e-buffer|-window |
|000034c0| 62 75 66 2d 41 20 77 69 | 6e 64 2d 41 20 62 75 66 |buf-A wi|nd-A buf|
|000034d0| 2d 42 20 77 69 6e 64 2d | 42 20 62 75 66 2d 43 20 |-B wind-|B buf-C |
|000034e0| 77 69 6e 64 2d 43 20 77 | 69 6e 64 6f 77 2d 66 72 |wind-C w|indow-fr|
|000034f0| 61 6d 65 20 66 72 61 6d | 65 2d 41 20 66 72 61 6d |ame fram|e-A fram|
|00003500| 65 2d 42 20 66 72 61 6d | 65 2d 43 20 53 74 61 72 |e-B fram|e-C Star|
|00003510| 74 42 75 66 66 65 72 20 | 63 6f 6e 74 72 6f 6c 2d |tBuffer |control-|
|00003520| 62 75 66 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |buf get-|buffer b|
|00003530| 75 66 66 65 72 2d 6e 61 | 6d 65 20 28 28 73 65 74 |uffer-na|me ((set|
|00003540| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00003550| 66 65 72 29 29 20 65 64 | 69 66 66 2d 77 69 64 65 |fer)) ed|iff-wide|
|00003560| 2d 64 69 73 70 6c 61 79 | 2d 70 20 74 68 69 73 2d |-display|-p this-|
|00003570| 63 6f 6d 6d 61 6e 64 20 | 65 64 69 66 66 2d 71 75 |command |ediff-qu|
|00003580| 69 74 20 65 72 72 6f 72 | 20 65 64 69 66 66 2d 4b |it error| ediff-K|
|00003590| 49 4c 4c 45 44 2d 56 49 | 54 41 4c 2d 42 55 46 46 |ILLED-VI|TAL-BUFF|
|000035a0| 45 52 20 66 6f 72 63 65 | 2d 6f 6e 65 2d 66 72 61 |ER force|-one-fra|
|000035b0| 6d 65 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |me ((set|-buffer |
|000035c0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 64 |StartBuf|fer)) ed|
|000035d0| 69 66 66 2d 73 70 6c 69 | 74 2d 77 69 6e 64 6f 77 |iff-spli|t-window|
|000035e0| 2d 66 75 6e 63 74 69 6f | 6e 20 73 70 6c 69 74 2d |-functio|n split-|
|000035f0| 77 69 6e 64 6f 77 2d 66 | 75 6e 63 74 69 6f 6e 20 |window-f|unction |
|00003600| 73 65 6c 65 63 74 65 64 | 2d 77 69 6e 64 6f 77 20 |selected|-window |
|00003610| 6f 72 69 67 2d 77 69 6e | 64 20 73 65 6c 65 63 74 |orig-win|d select|
|00003620| 65 64 2d 66 72 61 6d 65 | 20 6f 72 69 67 2d 66 72 |ed-frame| orig-fr|
|00003630| 61 6d 65 20 66 72 61 6d | 65 2d 6c 69 76 65 2d 70 |ame fram|e-live-p|
|00003640| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 6f 6b | ediff-w|indow-ok|
|00003650| 2d 66 6f 72 2d 64 69 73 | 70 6c 61 79 20 75 73 65 |-for-dis|play use|
|00003660| 2d 73 61 6d 65 2d 66 72 | 61 6d 65 20 75 73 65 2d |-same-fr|ame use-|
|00003670| 73 61 6d 65 2d 66 72 61 | 6d 65 2d 66 6f 72 2d 41 |same-fra|me-for-A|
|00003680| 42 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |B ((set-|buffer S|
|00003690| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|000036a0| 66 66 2d 6d 65 72 67 65 | 2d 77 69 6e 64 6f 77 2d |ff-merge|-window-|
|000036b0| 73 68 61 72 65 20 6d 65 | 72 67 65 2d 77 69 6e 64 |share me|rge-wind|
|000036c0| 6f 77 2d 73 68 61 72 65 | 20 6e 69 6c 20 6d 65 72 |ow-share| nil mer|
|000036d0| 67 65 2d 77 69 6e 64 6f | 77 2d 6c 69 6e 65 73 20 |ge-windo|w-lines |
|000036e0| 64 65 73 69 67 6e 61 74 | 65 64 2d 6d 69 6e 69 62 |designat|ed-minib|
|000036f0| 75 66 66 65 72 2d 66 72 | 61 6d 65 20 64 6f 6e 65 |uffer-fr|ame done|
|00003700| 2d 41 20 64 6f 6e 65 2d | 42 20 64 6f 6e 65 2d 43 |-A done-|B done-C|
|00003710| 20 77 69 6e 64 6f 77 2d | 6c 69 76 65 2d 70 20 73 | window-|live-p s|
|00003720| 65 6c 65 63 74 2d 77 69 | 6e 64 6f 77 20 64 65 6c |elect-wi|ndow del|
|00003730| 65 74 65 2d 6f 74 68 65 | 72 2d 77 69 6e 64 6f 77 |ete-othe|r-window|
|00003740| 73 20 74 20 6f 74 68 65 | 72 2d 77 69 6e 64 6f 77 |s t othe|r-window|
|00003750| 20 73 77 69 74 63 68 2d | 74 6f 2d 62 75 66 66 65 | switch-|to-buffe|
|00003760| 72 20 32 20 72 6f 75 6e | 64 20 77 69 6e 64 6f 77 |r 2 roun|d window|
|00003770| 2d 68 65 69 67 68 74 20 | 73 70 6c 69 74 2d 77 69 |-height |split-wi|
|00003780| 6e 64 6f 77 2d 76 65 72 | 74 69 63 61 6c 6c 79 20 |ndow-ver|tically |
|00003790| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|000037a0| 72 74 42 75 66 66 65 72 | 29 29 20 65 64 69 66 66 |rtBuffer|)) ediff|
|000037b0| 2d 77 69 6e 64 6f 77 2d | 41 20 65 64 69 66 66 2d |-window-|A ediff-|
|000037c0| 77 69 6e 64 6f 77 2d 42 | 20 65 64 69 66 66 2d 77 |window-B| ediff-w|
|000037d0| 69 6e 64 6f 77 2d 43 20 | 6d 69 6e 69 62 75 66 66 |indow-C |minibuff|
|000037e0| 65 72 2d 77 69 6e 64 6f | 77 20 65 64 69 66 66 2d |er-windo|w ediff-|
|000037f0| 73 65 74 75 70 2d 63 6f | 6e 74 72 6f 6c 2d 66 72 |setup-co|ntrol-fr|
|00003800| 61 6d 65 5d 20 35 5d 29 | 0a 28 64 65 66 61 6c 69 |ame] 5])|.(defali|
|00003810| 61 73 20 27 65 64 69 66 | 66 2d 73 65 74 75 70 2d |as 'edif|f-setup-|
|00003820| 77 69 6e 64 6f 77 73 2d | 6d 75 6c 74 69 66 72 61 |windows-|multifra|
|00003830| 6d 65 2d 63 6f 6d 70 61 | 72 65 20 23 5b 28 62 75 |me-compa|re #[(bu|
|00003840| 66 2d 41 20 62 75 66 2d | 42 20 62 75 66 2d 43 20 |f-A buf-|B buf-C |
|00003850| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 29 20 22 c0 c1 |control-|buf) "..|
|00003860| 21 88 c2 1b c4 0d 21 1e | 06 c4 0e 07 21 1e 08 c4 |!.....!.|....!...|
|00003870| 0e 09 21 1e 5c 6e 0e 06 | 85 20 00 cb 0e 06 21 1e |..!.\n..|. ....!.|
|00003880| 5c 66 0e 08 85 2b 00 cb | 0e 08 21 1e 0d 0e 5c 6e |\f...+..|..!...\n|
|00003890| 85 36 00 cb 0e 5c 6e 21 | 1e 0e 70 1e 0f 0e 10 83 |.6...\n!|..p.....|
|000038a0| 5e 00 d1 0e 10 21 83 5e | 00 d2 d1 0e 10 21 21 83 |^....!.^|.....!!.|
|000038b0| 5e 00 d3 8e 0e 10 71 88 | d4 0e 15 21 29 82 69 00 |^.....q.|...!).i.|
|000038c0| 0e 16 d7 3d 86 69 00 d8 | 0e 19 21 29 1e 1a 70 1e |...=.i..|..!)..p.|
|000038d0| 0f 0e 10 83 90 00 d1 0e | 10 21 83 90 00 d2 d1 0e |........|.!......|
|000038e0| 10 21 21 83 90 00 db 8e | 0e 10 71 88 0e 1c 29 82 |.!!.....|..q...).|
|000038f0| 9b 00 0e 16 d7 3d 86 9b | 00 d8 0e 19 21 29 1e 1d |.....=..|....!)..|
|00003900| 70 1e 0f 0e 10 83 c2 00 | d1 0e 10 21 83 c2 00 d2 |p.......|...!....|
|00003910| d1 0e 10 21 21 83 c2 00 | de 8e 0e 10 71 88 0e 1f |...!!...|....q...|
|00003920| 29 82 cd 00 0e 16 d7 3d | 86 cd 00 d8 0e 19 21 29 |)......=|......!)|
|00003930| 1e 20 70 1e 0f 0e 10 83 | f4 00 d1 0e 10 21 83 f4 |. p.....|.....!..|
|00003940| 00 d2 d1 0e 10 21 21 83 | f4 00 e1 8e 0e 10 71 88 |.....!!.|......q.|
|00003950| 0e 5c 22 29 82 ff 00 0e | 16 d7 3d 86 ff 00 d8 0e |.\")....|..=.....|
|00003960| 19 21 29 1e 23 e4 20 1e | 25 0e 1d 86 7e 01 0e 5c |.!).#. .|%...~..\|
|00003970| 66 0e 0d 3d 86 7e 01 e6 | 0e 06 21 3f 86 7e 01 e6 |f..=.~..|..!?.~..|
|00003980| 0e 08 21 3f 86 7e 01 0e | 23 83 58 01 0e 5c 66 0e |..!?.~..|#.X..\f.|
|00003990| 0e 3d 86 7e 01 0e 0d 0e | 0e 3d 86 7e 01 e6 0e 5c |.=.~....|.=.~...\|
|000039a0| 6e 21 3f 86 7e 01 d4 0e | 5c 66 21 3f 86 7e 01 d4 |n!?.~...|\f!?.~..|
|000039b0| 0e 0d 21 3f 86 7e 01 d4 | 0e 0e 21 3f 86 7e 01 d4 |..!?.~..|..!?.~..|
|000039c0| 0e 0d 21 84 6c 01 0e 1a | 86 7e 01 0e 5c 66 e7 20 |..!.l...|.~..\f. |
|000039d0| 3d 86 7e 01 d4 0e 5c 66 | 21 3f 85 7e 01 0e 1a 86 |=.~...\f|!?.~....|
|000039e0| 7e 01 0e 0d e7 20 3d 1e | 28 e9 1e 2a e9 1e 2b e9 |~.... =.|(..*..+.|
|000039f0| 1e 2c e9 1e 2d e9 1e 2e | e9 1e 2f 70 1e 0f 0e 10 |.,..-...|../p....|
|00003a00| 83 c3 01 d1 0e 10 21 83 | c3 01 d2 d1 0e 10 21 21 |......!.|......!!|
|00003a10| 83 c3 01 f0 8e 0e 10 71 | 88 f1 0e 32 40 21 16 2a |.......q|...2@!.*|
|00003a20| f1 0e 32 41 40 21 16 2b | 29 82 cf 01 0e 16 d7 3d |..2A@!.+|)......=|
|00003a30| 84 cf 01 d8 0e 19 21 88 | 29 f3 0e 06 21 83 eb 01 |......!.|)...!...|
|00003a40| 0e 28 84 eb 01 f4 0e 06 | 21 88 f5 20 88 e4 20 16 |.(......|!.. .. .|
|00003a50| 06 f6 16 2d f3 0e 08 21 | 83 06 02 0e 28 84 06 02 |...-...!|....(...|
|00003a60| f4 0e 08 21 88 f5 20 88 | e4 20 16 08 f6 16 2e f3 |...!.. .|. ......|
|00003a70| 0e 5c 6e 21 83 21 02 0e | 28 84 21 02 f4 0e 5c 6e |.\n!.!..|(.!...\n|
|00003a80| 21 88 f5 20 88 e4 20 16 | 5c 6e f6 16 2f 0e 28 83 |!.. .. .|\n../.(.|
|00003a90| 98 02 e9 1e 37 c0 20 88 | f5 20 88 f8 0d 21 88 e4 |....7. .|. ...!..|
|00003aa0| 20 16 06 0e 23 83 52 02 | 0e 20 f9 3d 83 4a 02 fa | ...#.R.|. .=.J..|
|00003ab0| 0e 06 21 82 4e 02 fb 0e | 06 21 fc a5 16 37 0e 20 |..!.N...|.!...7. |
|00003ac0| 0e 37 21 88 e4 20 0e 06 | 3d 83 64 02 fd c2 21 88 |.7!.. ..|=.d...!.|
|00003ad0| f8 0e 07 21 88 e4 20 16 | 08 0e 23 83 8e 02 0e 20 |...!.. .|..#.... |
|00003ae0| 20 88 e4 20 0e 06 0e 08 | 44 3e 83 85 02 fd c2 21 | .. ....|D>.....!|
|00003af0| 88 f8 0e 09 21 88 e4 20 | 16 5c 6e f6 16 2d f6 16 |....!.. |.\n..-..|
|00003b00| 2e f6 16 2f 29 0e 2d 84 | ad 02 f4 0e 25 21 88 f5 |.../).-.|....%!..|
|00003b10| 20 88 f8 0d 21 88 e4 20 | 16 06 0e 2e 84 c3 02 f4 | ...!.. |........|
|00003b20| 0e 25 21 88 f5 20 88 f8 | 0e 07 21 88 e4 20 16 08 |.%!.. ..|..!.. ..|
|00003b30| 0e 23 83 de 02 0e 2f 84 | de 02 f4 0e 25 21 88 f5 |.#..../.|....%!..|
|00003b40| 20 88 f8 0e 09 21 88 e4 | 20 16 5c 6e 70 1e 0f 0e | ....!..| .\np...|
|00003b50| 10 83 1c 03 d1 0e 10 21 | 83 1c 03 d2 d1 0e 10 21 |.......!|.......!|
|00003b60| 21 83 1c 03 fe 8e 0e 10 | 71 88 0e 06 16 3f 0e 08 |!.......|q....?..|
|00003b70| 16 40 0e 5c 6e 16 41 cb | 0e 3f 21 16 5c 66 cb 81 |.@.\n.A.|.?!.\f..|
|00003b80| 42 00 0e 5c 66 21 21 16 | 2c 29 82 28 03 0e 16 d7 |B..\f!!.|,).(....|
|00003b90| 3d 84 28 03 d8 0e 19 21 | 88 29 0e 43 83 40 03 81 |=.(....!|.).C.@..|
|00003ba0| 44 00 0e 06 0e 2a 5c 22 | 88 81 44 00 0e 08 0e 2b |D....*\"|..D....+|
|00003bb0| 5c 22 88 81 45 00 0e 10 | 0e 2c 5c 22 2e 13 87 22 |\"..E...|.,\"..."|
|00003bc0| 20 5b 65 64 69 66 66 2d | 73 6b 69 70 2d 75 6e 73 | [ediff-|skip-uns|
|00003bd0| 75 69 74 61 62 6c 65 2d | 66 72 61 6d 65 73 20 6f |uitable-|frames o|
|00003be0| 6b 2d 75 6e 73 70 6c 69 | 74 74 61 62 6c 65 20 31 |k-unspli|ttable 1|
|00003bf0| 20 77 69 6e 64 6f 77 2d | 6d 69 6e 2d 68 65 69 67 | window-|min-heig|
|00003c00| 68 74 20 65 64 69 66 66 | 2d 67 65 74 2d 76 69 73 |ht ediff|-get-vis|
|00003c10| 69 62 6c 65 2d 62 75 66 | 66 65 72 2d 77 69 6e 64 |ible-buf|fer-wind|
|00003c20| 6f 77 20 62 75 66 2d 41 | 20 77 69 6e 64 2d 41 20 |ow buf-A| wind-A |
|00003c30| 62 75 66 2d 42 20 77 69 | 6e 64 2d 42 20 62 75 66 |buf-B wi|nd-B buf|
|00003c40| 2d 43 20 77 69 6e 64 2d | 43 20 77 69 6e 64 6f 77 |-C wind-|C window|
|00003c50| 2d 66 72 61 6d 65 20 66 | 72 61 6d 65 2d 41 20 66 |-frame f|rame-A f|
|00003c60| 72 61 6d 65 2d 42 20 66 | 72 61 6d 65 2d 43 20 53 |rame-B f|rame-C S|
|00003c70| 74 61 72 74 42 75 66 66 | 65 72 20 63 6f 6e 74 72 |tartBuff|er contr|
|00003c80| 6f 6c 2d 62 75 66 20 67 | 65 74 2d 62 75 66 66 65 |ol-buf g|et-buffe|
|00003c90| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 28 28 |r buffer|-name ((|
|00003ca0| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00003cb0| 42 75 66 66 65 72 29 29 | 20 66 72 61 6d 65 2d 6c |Buffer))| frame-l|
|00003cc0| 69 76 65 2d 70 20 65 64 | 69 66 66 2d 63 6f 6e 74 |ive-p ed|iff-cont|
|00003cd0| 72 6f 6c 2d 66 72 61 6d | 65 20 74 68 69 73 2d 63 |rol-fram|e this-c|
|00003ce0| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 71 75 69 |ommand e|diff-qui|
|00003cf0| 74 20 65 72 72 6f 72 20 | 65 64 69 66 66 2d 4b 49 |t error |ediff-KI|
|00003d00| 4c 4c 45 44 2d 56 49 54 | 41 4c 2d 42 55 46 46 45 |LLED-VIT|AL-BUFFE|
|00003d10| 52 20 63 74 6c 2d 66 72 | 61 6d 65 2d 65 78 69 73 |R ctl-fr|ame-exis|
|00003d20| 74 73 2d 70 20 28 28 73 | 65 74 2d 62 75 66 66 65 |ts-p ((s|et-buffe|
|00003d30| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00003d40| 65 64 69 66 66 2d 77 69 | 64 65 2d 64 69 73 70 6c |ediff-wi|de-displ|
|00003d50| 61 79 2d 70 20 66 6f 72 | 63 65 2d 6f 6e 65 2d 66 |ay-p for|ce-one-f|
|00003d60| 72 61 6d 65 20 28 28 73 | 65 74 2d 62 75 66 66 65 |rame ((s|et-buffe|
|00003d70| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00003d80| 65 64 69 66 66 2d 73 70 | 6c 69 74 2d 77 69 6e 64 |ediff-sp|lit-wind|
|00003d90| 6f 77 2d 66 75 6e 63 74 | 69 6f 6e 20 73 70 6c 69 |ow-funct|ion spli|
|00003da0| 74 2d 77 69 6e 64 6f 77 | 2d 66 75 6e 63 74 69 6f |t-window|-functio|
|00003db0| 6e 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |n ((set-|buffer S|
|00003dc0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|00003dd0| 66 66 2d 33 77 61 79 2d | 63 6f 6d 70 61 72 69 73 |ff-3way-|comparis|
|00003de0| 6f 6e 2d 6a 6f 62 20 74 | 68 72 65 65 2d 77 61 79 |on-job t|hree-way|
|00003df0| 2d 63 6f 6d 70 61 72 69 | 73 6f 6e 20 73 65 6c 65 |-compari|son sele|
|00003e00| 63 74 65 64 2d 77 69 6e | 64 6f 77 20 6f 72 69 67 |cted-win|dow orig|
|00003e10| 2d 77 69 6e 64 20 65 64 | 69 66 66 2d 77 69 6e 64 |-wind ed|iff-wind|
|00003e20| 6f 77 2d 6f 6b 2d 66 6f | 72 2d 64 69 73 70 6c 61 |ow-ok-fo|r-displa|
|00003e30| 79 20 73 65 6c 65 63 74 | 65 64 2d 66 72 61 6d 65 |y select|ed-frame|
|00003e40| 20 75 73 65 2d 73 61 6d | 65 2d 66 72 61 6d 65 20 | use-sam|e-frame |
|00003e50| 6e 69 6c 20 77 69 6e 64 | 2d 41 2d 73 74 61 72 74 |nil wind|-A-start|
|00003e60| 20 77 69 6e 64 2d 42 2d | 73 74 61 72 74 20 64 65 | wind-B-|start de|
|00003e70| 73 69 67 6e 61 74 65 64 | 2d 6d 69 6e 69 62 75 66 |signated|-minibuf|
|00003e80| 66 65 72 2d 66 72 61 6d | 65 20 64 6f 6e 65 2d 41 |fer-fram|e done-A|
|00003e90| 20 64 6f 6e 65 2d 42 20 | 64 6f 6e 65 2d 43 20 28 | done-B |done-C (|
|00003ea0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00003eb0| 74 42 75 66 66 65 72 29 | 29 20 65 64 69 66 66 2d |tBuffer)|) ediff-|
|00003ec0| 6f 76 65 72 6c 61 79 2d | 73 74 61 72 74 20 65 64 |overlay-|start ed|
|00003ed0| 69 66 66 2d 6e 61 72 72 | 6f 77 2d 62 6f 75 6e 64 |iff-narr|ow-bound|
|00003ee0| 73 20 77 69 6e 64 6f 77 | 2d 6c 69 76 65 2d 70 20 |s window|-live-p |
|00003ef0| 73 65 6c 65 63 74 2d 77 | 69 6e 64 6f 77 20 64 65 |select-w|indow de|
|00003f00| 6c 65 74 65 2d 6f 74 68 | 65 72 2d 77 69 6e 64 6f |lete-oth|er-windo|
|00003f10| 77 73 20 74 20 77 69 6e | 64 2d 77 69 64 74 68 2d |ws t win|d-width-|
|00003f20| 6f 72 2d 68 65 69 67 68 | 74 20 73 77 69 74 63 68 |or-heigh|t switch|
|00003f30| 2d 74 6f 2d 62 75 66 66 | 65 72 20 73 70 6c 69 74 |-to-buff|er split|
|00003f40| 2d 77 69 6e 64 6f 77 2d | 76 65 72 74 69 63 61 6c |-window-|vertical|
|00003f50| 6c 79 20 77 69 6e 64 6f | 77 2d 68 65 69 67 68 74 |ly windo|w-height|
|00003f60| 20 77 69 6e 64 6f 77 2d | 77 69 64 74 68 20 33 20 | window-|width 3 |
|00003f70| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 20 28 28 73 |other-wi|ndow ((s|
|00003f80| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00003f90| 75 66 66 65 72 29 29 20 | 65 64 69 66 66 2d 77 69 |uffer)) |ediff-wi|
|00003fa0| 6e 64 6f 77 2d 41 20 65 | 64 69 66 66 2d 77 69 6e |ndow-A e|diff-win|
|00003fb0| 64 6f 77 2d 42 20 65 64 | 69 66 66 2d 77 69 6e 64 |dow-B ed|iff-wind|
|00003fc0| 6f 77 2d 43 20 6d 69 6e | 69 62 75 66 66 65 72 2d |ow-C min|ibuffer-|
|00003fd0| 77 69 6e 64 6f 77 20 65 | 64 69 66 66 2d 77 69 6e |window e|diff-win|
|00003fe0| 64 6f 77 73 2d 6a 6f 62 | 20 73 65 74 2d 77 69 6e |dows-job| set-win|
|00003ff0| 64 6f 77 2d 73 74 61 72 | 74 20 65 64 69 66 66 2d |dow-star|t ediff-|
|00004000| 73 65 74 75 70 2d 63 6f | 6e 74 72 6f 6c 2d 66 72 |setup-co|ntrol-fr|
|00004010| 61 6d 65 5d 20 33 5d 29 | 0a 28 64 65 66 61 6c 69 |ame] 3])|.(defali|
|00004020| 61 73 20 27 65 64 69 66 | 66 2d 73 6b 69 70 2d 75 |as 'edif|f-skip-u|
|00004030| 6e 73 75 69 74 61 62 6c | 65 2d 66 72 61 6d 65 73 |nsuitabl|e-frames|
|00004040| 20 23 5b 28 26 6f 70 74 | 69 6f 6e 61 6c 20 6f 6b | #[(&opt|ional ok|
|00004050| 2d 75 6e 73 70 6c 69 74 | 74 61 62 6c 65 29 20 22 |-unsplit|table) "|
|00004060| c0 20 85 77 00 c1 1a c3 | 20 5c 6e 3d 84 6a 00 c4 |. .w....| \n=.j..|
|00004070| c5 20 21 84 5b 00 c5 20 | 1e 06 c0 20 85 37 00 c7 |. !.[.. |... .7..|
|00004080| 0e 06 21 85 37 00 0e 08 | 83 31 00 c9 0e 06 21 82 |..!.7...|.1....!.|
|00004090| 37 00 ca 0e 06 21 cb 3d | 29 84 5b 00 cc c5 20 21 |7....!.=|).[... !|
|000040a0| 0e 0d ce 5f 57 84 5b 00 | 0e 0f 84 6a 00 c5 20 1e |..._W.[.|...j.. .|
|000040b0| 06 d0 d1 0e 06 21 9e 41 | 29 83 6a 00 5c 6e 84 62 |.....!.A|).j.\n.b|
|000040c0| 00 c3 20 12 d2 d3 d4 5c | 22 88 82 07 00 c3 20 5c |.. ....\|"..... \|
|000040d0| 6e 3d 85 76 00 d5 d6 d7 | 21 21 29 87 22 20 5b 65 |n=.v....|!!)." [e|
|000040e0| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 64 69 73 70 |diff-win|dow-disp|
|000040f0| 6c 61 79 2d 70 20 6e 69 | 6c 20 6c 61 73 74 2d 77 |lay-p ni|l last-w|
|00004100| 69 6e 64 6f 77 20 73 65 | 6c 65 63 74 65 64 2d 77 |indow se|lected-w|
|00004110| 69 6e 64 6f 77 20 65 64 | 69 66 66 2d 66 72 61 6d |indow ed|iff-fram|
|00004120| 65 2d 68 61 73 2d 64 65 | 64 69 63 61 74 65 64 2d |e-has-de|dicated-|
|00004130| 77 69 6e 64 6f 77 73 20 | 73 65 6c 65 63 74 65 64 |windows |selected|
|00004140| 2d 66 72 61 6d 65 20 66 | 72 61 6d 65 20 66 72 61 |-frame f|rame fra|
|00004150| 6d 65 2d 6c 69 76 65 2d | 70 20 65 64 69 66 66 2d |me-live-|p ediff-|
|00004160| 78 65 6d 61 63 73 2d 70 | 20 66 72 61 6d 65 2d 69 |xemacs-p| frame-i|
|00004170| 63 6f 6e 69 66 69 65 64 | 2d 70 20 66 72 61 6d 65 |conified|-p frame|
|00004180| 2d 76 69 73 69 62 6c 65 | 2d 70 20 69 63 6f 6e 20 |-visible|-p icon |
|00004190| 66 72 61 6d 65 2d 68 65 | 69 67 68 74 20 77 69 6e |frame-he|ight win|
|000041a0| 64 6f 77 2d 6d 69 6e 2d | 68 65 69 67 68 74 20 33 |dow-min-|height 3|
|000041b0| 20 6f 6b 2d 75 6e 73 70 | 6c 69 74 74 61 62 6c 65 | ok-unsp|littable|
|000041c0| 20 75 6e 73 70 6c 69 74 | 74 61 62 6c 65 20 66 72 | unsplit|table fr|
|000041d0| 61 6d 65 2d 70 61 72 61 | 6d 65 74 65 72 73 20 6f |ame-para|meters o|
|000041e0| 74 68 65 72 2d 77 69 6e | 64 6f 77 20 31 20 74 20 |ther-win|dow 1 t |
|000041f0| 73 65 6c 65 63 74 2d 66 | 72 61 6d 65 20 6d 61 6b |select-f|rame mak|
|00004200| 65 2d 66 72 61 6d 65 20 | 28 28 75 6e 73 70 6c 69 |e-frame |((unspli|
|00004210| 74 74 61 62 6c 65 29 29 | 5d 20 33 5d 29 0a 28 64 |ttable))|] 3]).(d|
|00004220| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 66 |efalias |'ediff-f|
|00004230| 72 61 6d 65 2d 68 61 73 | 2d 64 65 64 69 63 61 74 |rame-has|-dedicat|
|00004240| 65 64 2d 77 69 6e 64 6f | 77 73 20 23 5b 28 66 72 |ed-windo|ws #[(fr|
|00004250| 61 6d 65 29 20 22 c0 20 | c1 1a 1b c4 0d 21 88 c6 |ame) ". |.....!..|
|00004260| c7 c8 0d 23 88 c4 0b 21 | 88 5c 6e 2a 87 22 20 5b |...#...!|.\n*." [|
|00004270| 73 65 6c 65 63 74 65 64 | 2d 66 72 61 6d 65 20 6e |selected|-frame n|
|00004280| 69 6c 20 61 6e 73 20 63 | 75 72 2d 66 72 20 73 65 |il ans c|ur-fr se|
|00004290| 6c 65 63 74 2d 66 72 61 | 6d 65 20 66 72 61 6d 65 |lect-fra|me frame|
|000042a0| 20 77 61 6c 6b 2d 77 69 | 6e 64 6f 77 73 20 23 5b | walk-wi|ndows #[|
|000042b0| 28 77 69 6e 64 29 20 22 | c0 09 21 85 09 00 c2 89 |(wind) "|..!.....|
|000042c0| 13 87 22 20 5b 77 69 6e | 64 6f 77 2d 64 65 64 69 |.." [win|dow-dedi|
|000042d0| 63 61 74 65 64 2d 70 20 | 77 69 6e 64 20 74 20 61 |cated-p |wind t a|
|000042e0| 6e 73 5d 20 32 5d 20 69 | 67 6e 6f 72 65 2d 6d 69 |ns] 2] i|gnore-mi|
|000042f0| 6e 69 62 75 66 66 65 72 | 5d 20 34 5d 29 0a 28 64 |nibuffer|] 4]).(d|
|00004300| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 77 |efalias |'ediff-w|
|00004310| 69 6e 64 6f 77 2d 6f 6b | 2d 66 6f 72 2d 64 69 73 |indow-ok|-for-dis|
|00004320| 70 6c 61 79 20 23 5b 28 | 77 69 6e 64 29 20 22 c0 |play #[(|wind) ".|
|00004330| 09 21 85 18 00 09 c2 09 | c3 c4 09 21 23 3d 86 18 |.!......|...!#=..|
|00004340| 00 c5 c4 09 21 21 3f 87 | 22 20 5b 77 69 6e 64 6f |....!!?.|" [windo|
|00004350| 77 2d 6c 69 76 65 2d 70 | 20 77 69 6e 64 20 6e 65 |w-live-p| wind ne|
|00004360| 78 74 2d 77 69 6e 64 6f | 77 20 69 67 6e 6f 72 65 |xt-windo|w ignore|
|00004370| 2d 6d 69 6e 69 62 75 66 | 66 65 72 20 77 69 6e 64 |-minibuf|fer wind|
|00004380| 6f 77 2d 66 72 61 6d 65 | 20 65 64 69 66 66 2d 66 |ow-frame| ediff-f|
|00004390| 72 61 6d 65 2d 68 61 73 | 2d 64 65 64 69 63 61 74 |rame-has|-dedicat|
|000043a0| 65 64 2d 77 69 6e 64 6f | 77 73 5d 20 36 5d 29 0a |ed-windo|ws] 6]).|
|000043b0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|000043c0| 2d 73 65 74 75 70 2d 63 | 6f 6e 74 72 6f 6c 2d 66 |-setup-c|ontrol-f|
|000043d0| 72 61 6d 65 20 23 5b 28 | 63 74 6c 2d 62 75 66 66 |rame #[(|ctl-buff|
|000043e0| 65 72 20 64 65 73 69 67 | 6e 61 74 65 64 2d 6d 69 |er desig|nated-mi|
|000043f0| 6e 69 62 75 66 66 65 72 | 2d 66 72 61 6d 65 29 20 |nibuffer|-frame) |
|00004400| 22 c0 c1 89 89 89 89 89 | 89 89 89 1a 1b 1c 1d 1e |".......|........|
|00004410| 06 1e 07 1e 08 1e 09 1e | 5c 6e 1e 0b 70 1e 5c 66 |........|\n..p.\f|
|00004420| 0e 0d 83 49 00 ce 0e 0d | 21 83 49 00 cf ce 0e 0d |...I....|!.I.....|
|00004430| 21 21 83 49 00 d0 8e 0e | 0d 71 88 0e 11 83 41 00 |!!.I....|.q....A.|
|00004440| d2 c1 21 88 d3 d4 21 88 | 29 82 55 00 0e 15 d6 3d |..!...!.|).U....=|
|00004450| 84 55 00 d7 0e 18 21 88 | 29 70 1e 5c 66 0e 0d 83 |.U....!.|)p.\f...|
|00004460| 7a 00 ce 0e 0d 21 83 7a | 00 cf ce 0e 0d 21 21 83 |z....!.z|.....!!.|
|00004470| 7a 00 d9 8e 0e 0d 71 88 | 0e 1a 29 82 85 00 0e 15 |z.....q.|..).....|
|00004480| d6 3d 86 85 00 d7 0e 18 | 21 29 16 06 70 1e 5c 66 |.=......|!)..p.\f|
|00004490| 0e 0d 83 bf 00 ce 0e 0d | 21 83 bf 00 cf ce 0e 0d |........|!.......|
|000044a0| 21 21 83 bf 00 db 8e 0e | 0d 71 88 dc 0e 06 21 83 |!!......|.q....!.|
|000044b0| b2 00 0e 06 82 b6 00 dd | 0e 1e 21 89 16 07 16 1a |........|..!.....|
|000044c0| 29 82 cb 00 0e 15 d6 3d | 84 cb 00 d7 0e 18 21 88 |)......=|......!.|
|000044d0| 29 0e 07 1e 1f e0 20 85 | ee 00 dc 0e 1f 21 85 ee |)..... .|.....!..|
|000044e0| 00 0e 11 83 e8 00 e1 0e | 1f 21 82 ee 00 e2 0e 1f |........|.!......|
|000044f0| 21 e3 3d 29 16 5c 6e e4 | 0e 07 21 88 e5 e6 20 21 |!.=).\n.|..!... !|
|00004500| 84 05 01 e7 20 88 e8 0e | 0d 21 88 70 1e 5c 66 0e |.... ...|.!.p.\f.|
|00004510| 0d 83 33 01 ce 0e 0d 21 | 83 33 01 cf ce 0e 0d 21 |..3....!|.3.....!|
|00004520| 21 83 33 01 e9 8e 0e 0d | 71 88 ea eb 21 88 ea ec |!.3.....|q...!...|
|00004530| 21 88 ea ed 21 88 29 82 | 3f 01 0e 15 d6 3d 84 3f |!...!.).|?....=.?|
|00004540| 01 d7 0e 18 21 88 29 ee | 0e 0d 21 88 0e 2f 0e 30 |....!.).|..!../.0|
|00004550| 98 3f 16 09 0e 15 f1 3d | 85 56 01 0e 09 16 08 f2 |.?.....=|.V......|
|00004560| 65 64 5c 22 54 89 15 14 | f3 20 f4 5c 5c 13 f5 f6 |ed\"T...|. .\\...|
|00004570| f7 0e 38 21 42 f9 0b 42 | fa 5c 66 42 45 0e 3b 0e |..8!B..B|.\fBE.;.|
|00004580| 0d 0b 5c 66 23 5c 22 12 | 0e 3c 83 85 01 fd 5c 6e |..\f#\".|.<....\n|
|00004590| 42 12 0e 11 83 b6 01 fe | 0e 3f 0e 07 81 40 00 44 |B.......|.?...@.D|
|000045a0| 5c 22 88 fe 0e 41 0e 07 | 81 40 00 44 5c 22 88 fe |\"...A..|.@.D\"..|
|000045b0| 0e 42 0e 07 81 40 00 44 | 5c 22 88 fe 0e 43 0e 07 |.B...@.D|\"...C..|
|000045c0| 81 40 00 44 5c 22 88 0e | 44 81 45 00 3e 83 c7 01 |.@.D\"..|D.E.>...|
|000045d0| 81 46 00 0e 07 5c 6e 5c | 22 88 65 62 88 81 46 00 |.F...\n\|".eb..F.|
|000045e0| 0e 07 5c 6e 5c 22 88 81 | 47 00 0e 07 21 88 e4 0e |..\n\"..|G...!...|
|000045f0| 07 21 88 81 48 00 20 88 | 0e 49 83 fc 01 0e 5c 6e |.!..H. .|.I....\n|
|00004600| 84 fc 01 0e 09 84 fc 01 | 81 4a 00 0e 07 21 88 82 |........|.J...!..|
|00004610| 0d 02 0e 08 84 06 02 0e | 5c 6e 84 0d 02 81 4b 00 |........|\n....K.|
|00004620| 0e 07 21 88 81 4c 00 e6 | 20 81 4d 00 5c 22 88 e0 |..!..L..| .M.\"..|
|00004630| 20 83 4a 02 81 4e 00 1e | 4f 81 50 00 81 51 00 21 | .J..N..|O.P..Q.!|
|00004640| 88 e2 0e 07 21 84 49 02 | 0e 4f 81 40 00 56 83 49 |....!.I.|.O.@.V.I|
|00004650| 02 0e 4f 53 16 4f 81 50 | 00 81 52 00 21 88 82 29 |..OS.O.P|..R.!..)|
|00004660| 02 29 81 53 00 0e 07 21 | 84 68 02 81 54 00 0e 07 |.).S...!|.h..T...|
|00004670| 0e 15 d6 3d 86 66 02 0e | 55 81 4d 00 3d 3f 5c 22 |...=.f..|U.M.=?\"|
|00004680| 88 0e 11 83 b5 02 70 1e | 5c 66 0e 0d 83 a8 02 ce |......p.|\f......|
|00004690| 0e 0d 21 83 a8 02 cf ce | 0e 0d 21 21 83 a8 02 81 |..!.....|..!!....|
|000046a0| 56 00 8e 0e 0d 71 88 81 | 57 00 81 58 00 21 88 81 |V....q..|W..X.!..|
|000046b0| 59 00 81 58 00 81 5a 00 | c1 81 4d 00 24 88 29 82 |Y..X..Z.|..M.$.).|
|000046c0| b4 02 0e 15 d6 3d 84 b4 | 02 d7 0e 18 21 88 29 70 |.....=..|....!.)p|
|000046d0| 1e 5c 66 0e 0d 83 de 02 | ce 0e 0d 21 83 de 02 cf |.\f.....|...!....|
|000046e0| ce 0e 0d 21 21 83 de 02 | 81 5b 00 8e 0e 0d 71 88 |...!!...|.[....q.|
|000046f0| d3 81 5c 5c 00 21 29 82 | e9 02 0e 15 d6 3d 86 e9 |..\\.!).|.....=..|
|00004700| 02 d7 0e 18 21 2e 0b 87 | 22 20 5b 31 20 6e 69 6c |....!...|" [1 nil|
|00004710| 20 61 64 6a 75 73 74 65 | 64 2d 70 61 72 61 6d 65 | adjuste|d-parame|
|00004720| 74 65 72 73 20 66 77 69 | 64 74 68 20 66 68 65 69 |ters fwi|dth fhei|
|00004730| 67 68 74 20 6c 69 6e 65 | 73 20 6f 6c 64 2d 63 74 |ght line|s old-ct|
|00004740| 6c 2d 66 72 61 6d 65 20 | 63 74 6c 2d 66 72 61 6d |l-frame |ctl-fram|
|00004750| 65 20 64 65 69 63 6f 6e | 69 66 79 2d 63 74 6c 2d |e deicon|ify-ctl-|
|00004760| 66 72 61 6d 65 20 64 6f | 6e 74 2d 69 63 6f 6e 69 |frame do|nt-iconi|
|00004770| 66 79 2d 63 74 6c 2d 66 | 72 61 6d 65 20 63 74 6c |fy-ctl-f|rame ctl|
|00004780| 2d 66 72 61 6d 65 2d 69 | 63 6f 6e 69 66 69 65 64 |-frame-i|conified|
|00004790| 2d 70 20 77 69 6e 64 6f | 77 2d 6d 69 6e 2d 68 65 |-p windo|w-min-he|
|000047a0| 69 67 68 74 20 53 74 61 | 72 74 42 75 66 66 65 72 |ight Sta|rtBuffer|
|000047b0| 20 63 74 6c 2d 62 75 66 | 66 65 72 20 67 65 74 2d | ctl-buf|fer get-|
|000047c0| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|000047d0| 6d 65 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |me ((set|-buffer |
|000047e0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 64 |StartBuf|fer)) ed|
|000047f0| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 73 65 74 |iff-xema|cs-p set|
|00004800| 2d 62 75 66 66 65 72 2d | 6d 65 6e 75 62 61 72 20 |-buffer-|menubar |
|00004810| 72 75 6e 2d 68 6f 6f 6b | 73 20 65 64 69 66 66 2d |run-hook|s ediff-|
|00004820| 62 65 66 6f 72 65 2d 73 | 65 74 75 70 2d 63 6f 6e |before-s|etup-con|
|00004830| 74 72 6f 6c 2d 66 72 61 | 6d 65 2d 68 6f 6f 6b 20 |trol-fra|me-hook |
|00004840| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 65 64 69 |this-com|mand edi|
|00004850| 66 66 2d 71 75 69 74 20 | 65 72 72 6f 72 20 65 64 |ff-quit |error ed|
|00004860| 69 66 66 2d 4b 49 4c 4c | 45 44 2d 56 49 54 41 4c |iff-KILL|ED-VITAL|
|00004870| 2d 42 55 46 46 45 52 20 | 28 28 73 65 74 2d 62 75 |-BUFFER |((set-bu|
|00004880| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00004890| 29 29 20 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |)) ediff|-control|
|000048a0| 2d 66 72 61 6d 65 20 28 | 28 73 65 74 2d 62 75 66 |-frame (|(set-buf|
|000048b0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|000048c0| 29 20 66 72 61 6d 65 2d | 6c 69 76 65 2d 70 20 6d |) frame-|live-p m|
|000048d0| 61 6b 65 2d 66 72 61 6d | 65 20 65 64 69 66 66 2d |ake-fram|e ediff-|
|000048e0| 63 6f 6e 74 72 6f 6c 2d | 66 72 61 6d 65 2d 70 61 |control-|frame-pa|
|000048f0| 72 61 6d 65 74 65 72 73 | 20 66 72 61 6d 65 20 65 |rameters| frame e|
|00004900| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 64 69 73 70 |diff-win|dow-disp|
|00004910| 6c 61 79 2d 70 20 66 72 | 61 6d 65 2d 69 63 6f 6e |lay-p fr|ame-icon|
|00004920| 69 66 69 65 64 2d 70 20 | 66 72 61 6d 65 2d 76 69 |ified-p |frame-vi|
|00004930| 73 69 62 6c 65 2d 70 20 | 69 63 6f 6e 20 73 65 6c |sible-p |icon sel|
|00004940| 65 63 74 2d 66 72 61 6d | 65 20 77 69 6e 64 6f 77 |ect-fram|e window|
|00004950| 2d 64 65 64 69 63 61 74 | 65 64 2d 70 20 73 65 6c |-dedicat|ed-p sel|
|00004960| 65 63 74 65 64 2d 77 69 | 6e 64 6f 77 20 64 65 6c |ected-wi|ndow del|
|00004970| 65 74 65 2d 6f 74 68 65 | 72 2d 77 69 6e 64 6f 77 |ete-othe|r-window|
|00004980| 73 20 73 77 69 74 63 68 | 2d 74 6f 2d 62 75 66 66 |s switch|-to-buff|
|00004990| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|000049a0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 6d 61 |StartBuf|fer)) ma|
|000049b0| 6b 65 2d 6c 6f 63 61 6c | 2d 76 61 72 69 61 62 6c |ke-local|-variabl|
|000049c0| 65 20 66 72 61 6d 65 2d | 74 69 74 6c 65 2d 66 6f |e frame-|title-fo|
|000049d0| 72 6d 61 74 20 66 72 61 | 6d 65 2d 69 63 6f 6e 2d |rmat fra|me-icon-|
|000049e0| 74 69 74 6c 65 2d 66 6f | 72 6d 61 74 20 69 63 6f |title-fo|rmat ico|
|000049f0| 6e 2d 74 69 74 6c 65 2d | 66 6f 72 6d 61 74 20 65 |n-title-|format e|
|00004a00| 64 69 66 66 2d 73 65 74 | 75 70 2d 63 6f 6e 74 72 |diff-set|up-contr|
|00004a10| 6f 6c 2d 62 75 66 66 65 | 72 20 65 64 69 66 66 2d |ol-buffe|r ediff-|
|00004a20| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 20 65 64 69 |help-mes|sage edi|
|00004a30| 66 66 2d 62 72 69 65 66 | 2d 68 65 6c 70 2d 6d 65 |ff-brief|-help-me|
|00004a40| 73 73 61 67 65 20 65 64 | 69 66 66 2d 74 6f 67 67 |ssage ed|iff-togg|
|00004a50| 6c 65 2d 68 65 6c 70 20 | 63 6f 75 6e 74 2d 6c 69 |le-help |count-li|
|00004a60| 6e 65 73 20 65 64 69 66 | 66 2d 68 65 6c 70 2d 6d |nes edif|f-help-m|
|00004a70| 65 73 73 61 67 65 2d 6c | 69 6e 65 2d 6c 65 6e 67 |essage-l|ine-leng|
|00004a80| 74 68 20 32 20 61 70 70 | 65 6e 64 20 6d 69 6e 69 |th 2 app|end mini|
|00004a90| 62 75 66 66 65 72 20 6d | 69 6e 69 62 75 66 66 65 |buffer m|inibuffe|
|00004aa0| 72 2d 77 69 6e 64 6f 77 | 20 64 65 73 69 67 6e 61 |r-window| designa|
|00004ab0| 74 65 64 2d 6d 69 6e 69 | 62 75 66 66 65 72 2d 66 |ted-mini|buffer-f|
|00004ac0| 72 61 6d 65 20 77 69 64 | 74 68 20 68 65 69 67 68 |rame wid|th heigh|
|00004ad0| 74 20 65 64 69 66 66 2d | 63 6f 6e 74 72 6f 6c 2d |t ediff-|control-|
|00004ae0| 66 72 61 6d 65 2d 70 6f | 73 69 74 69 6f 6e 2d 66 |frame-po|sition-f|
|00004af0| 75 6e 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 75 73 |unction |ediff-us|
|00004b00| 65 2d 6c 6f 6e 67 2d 68 | 65 6c 70 2d 6d 65 73 73 |e-long-h|elp-mess|
|00004b10| 61 67 65 20 28 61 75 74 | 6f 2d 72 61 69 73 65 29 |age (aut|o-raise)|
|00004b20| 20 73 65 74 2d 73 70 65 | 63 69 66 69 65 72 20 74 | set-spe|cifier t|
|00004b30| 6f 70 2d 74 6f 6f 6c 62 | 61 72 2d 68 65 69 67 68 |op-toolb|ar-heigh|
|00004b40| 74 20 30 20 62 6f 74 74 | 6f 6d 2d 74 6f 6f 6c 62 |t 0 bott|om-toolb|
|00004b50| 61 72 2d 68 65 69 67 68 | 74 20 6c 65 66 74 2d 74 |ar-heigh|t left-t|
|00004b60| 6f 6f 6c 62 61 72 2d 77 | 69 64 74 68 20 72 69 67 |oolbar-w|idth rig|
|00004b70| 68 74 2d 74 6f 6f 6c 62 | 61 72 2d 77 69 64 74 68 |ht-toolb|ar-width|
|00004b80| 20 73 79 73 74 65 6d 2d | 74 79 70 65 20 28 65 6d | system-|type (em|
|00004b90| 78 20 77 69 6e 64 6f 77 | 73 2d 6e 74 20 77 69 6e |x window|s-nt win|
|00004ba0| 64 6f 77 73 2d 39 35 29 | 20 6d 6f 64 69 66 79 2d |dows-95)| modify-|
|00004bb0| 66 72 61 6d 65 2d 70 61 | 72 61 6d 65 74 65 72 73 |frame-pa|rameters|
|00004bc0| 20 6d 61 6b 65 2d 66 72 | 61 6d 65 2d 76 69 73 69 | make-fr|ame-visi|
|00004bd0| 62 6c 65 20 65 64 69 66 | 66 2d 72 65 66 72 65 73 |ble edif|f-refres|
|00004be0| 68 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 20 |h-contro|l-frame |
|00004bf0| 65 64 69 66 66 2d 70 72 | 65 66 65 72 2d 69 63 6f |ediff-pr|efer-ico|
|00004c00| 6e 69 66 69 65 64 2d 63 | 6f 6e 74 72 6f 6c 2d 66 |nified-c|ontrol-f|
|00004c10| 72 61 6d 65 20 69 63 6f | 6e 69 66 79 2d 66 72 61 |rame ico|nify-fra|
|00004c20| 6d 65 20 72 61 69 73 65 | 2d 66 72 61 6d 65 20 73 |me raise|-frame s|
|00004c30| 65 74 2d 77 69 6e 64 6f | 77 2d 64 65 64 69 63 61 |et-windo|w-dedica|
|00004c40| 74 65 64 2d 70 20 74 20 | 37 20 63 6f 75 6e 74 20 |ted-p t |7 count |
|00004c50| 73 69 74 2d 66 6f 72 20 | 30 2e 31 30 30 30 30 30 |sit-for |0.100000|
|00004c60| 30 30 30 30 30 30 30 30 | 30 30 31 20 30 2e 32 39 |00000000|001 0.29|
|00004c70| 39 39 39 39 39 39 39 39 | 39 39 39 39 39 39 39 20 |99999999|9999999 |
|00004c80| 65 64 69 66 66 2d 66 72 | 61 6d 65 2d 69 63 6f 6e |ediff-fr|ame-icon|
|00004c90| 69 66 69 65 64 2d 70 20 | 65 64 69 66 66 2d 72 65 |ified-p |ediff-re|
|00004ca0| 73 65 74 2d 6d 6f 75 73 | 65 20 65 64 69 66 66 2d |set-mous|e ediff-|
|00004cb0| 67 72 61 62 2d 6d 6f 75 | 73 65 20 28 28 73 65 74 |grab-mou|se ((set|
|00004cc0| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00004cd0| 66 65 72 29 29 20 6d 61 | 6b 65 2d 6c 6f 63 61 6c |fer)) ma|ke-local|
|00004ce0| 2d 68 6f 6f 6b 20 73 65 | 6c 65 63 74 2d 66 72 61 |-hook se|lect-fra|
|00004cf0| 6d 65 2d 68 6f 6f 6b 20 | 61 64 64 2d 68 6f 6f 6b |me-hook |add-hook|
|00004d00| 20 65 64 69 66 66 2d 78 | 65 6d 61 63 73 2d 73 65 | ediff-x|emacs-se|
|00004d10| 6c 65 63 74 2d 66 72 61 | 6d 65 2d 68 6f 6f 6b 20 |lect-fra|me-hook |
|00004d20| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00004d30| 72 74 42 75 66 66 65 72 | 29 29 20 65 64 69 66 66 |rtBuffer|)) ediff|
|00004d40| 2d 61 66 74 65 72 2d 73 | 65 74 75 70 2d 63 6f 6e |-after-s|etup-con|
|00004d50| 74 72 6f 6c 2d 66 72 61 | 6d 65 2d 68 6f 6f 6b 5d |trol-fra|me-hook]|
|00004d60| 20 31 31 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 | 11]).(d|efalias |
|00004d70| 27 65 64 69 66 66 2d 64 | 65 73 74 72 6f 79 2d 63 |'ediff-d|estroy-c|
|00004d80| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 20 23 5b 28 |ontrol-f|rame #[(|
|00004d90| 63 74 6c 2d 62 75 66 66 | 65 72 29 20 22 70 18 09 |ctl-buff|er) "p..|
|00004da0| 83 40 00 c2 09 21 83 40 | 00 c3 c2 09 21 21 83 40 |.@...!.@|....!!.@|
|00004db0| 00 c4 8e 09 71 88 c5 20 | 83 3c 00 c6 0e 07 21 83 |....q.. |.<....!.|
|00004dc0| 3c 00 0e 07 1e 08 0e 09 | 83 33 00 ca 0e 0b 21 88 |<.......|.3....!.|
|00004dd0| cc 16 07 cd 0e 08 21 88 | 29 29 82 4c 00 0e 0e cf |......!.|)).L....|
|00004de0| 3d 84 4c 00 d0 0e 11 21 | 88 29 d2 20 87 22 20 5b |=.L....!|.). ." [|
|00004df0| 53 74 61 72 74 42 75 66 | 66 65 72 20 63 74 6c 2d |StartBuf|fer ctl-|
|00004e00| 62 75 66 66 65 72 20 67 | 65 74 2d 62 75 66 66 65 |buffer g|et-buffe|
|00004e10| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 28 28 |r buffer|-name ((|
|00004e20| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00004e30| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 77 |Buffer))| ediff-w|
|00004e40| 69 6e 64 6f 77 2d 64 69 | 73 70 6c 61 79 2d 70 20 |indow-di|splay-p |
|00004e50| 66 72 61 6d 65 2d 6c 69 | 76 65 2d 70 20 65 64 69 |frame-li|ve-p edi|
|00004e60| 66 66 2d 63 6f 6e 74 72 | 6f 6c 2d 66 72 61 6d 65 |ff-contr|ol-frame|
|00004e70| 20 63 74 6c 2d 66 72 61 | 6d 65 20 65 64 69 66 66 | ctl-fra|me ediff|
|00004e80| 2d 78 65 6d 61 63 73 2d | 70 20 73 65 74 2d 62 75 |-xemacs-|p set-bu|
|00004e90| 66 66 65 72 2d 6d 65 6e | 75 62 61 72 20 64 65 66 |ffer-men|ubar def|
|00004ea0| 61 75 6c 74 2d 6d 65 6e | 75 62 61 72 20 6e 69 6c |ault-men|ubar nil|
|00004eb0| 20 64 65 6c 65 74 65 2d | 66 72 61 6d 65 20 74 68 | delete-|frame th|
|00004ec0| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00004ed0| 2d 71 75 69 74 20 65 72 | 72 6f 72 20 65 64 69 66 |-quit er|ror edif|
|00004ee0| 66 2d 4b 49 4c 4c 45 44 | 2d 56 49 54 41 4c 2d 42 |f-KILLED|-VITAL-B|
|00004ef0| 55 46 46 45 52 20 65 64 | 69 66 66 2d 73 6b 69 70 |UFFER ed|iff-skip|
|00004f00| 2d 75 6e 73 75 69 74 61 | 62 6c 65 2d 66 72 61 6d |-unsuita|ble-fram|
|00004f10| 65 73 5d 20 33 5d 29 0a | 28 64 65 66 61 6c 69 61 |es] 3]).|(defalia|
|00004f20| 73 20 27 65 64 69 66 66 | 2d 6d 61 6b 65 2d 66 72 |s 'ediff|-make-fr|
|00004f30| 61 6d 65 2d 70 6f 73 69 | 74 69 6f 6e 20 23 5b 28 |ame-posi|tion #[(|
|00004f40| 63 74 6c 2d 62 75 66 66 | 65 72 20 63 74 6c 2d 66 |ctl-buff|er ctl-f|
|00004f50| 72 61 6d 65 2d 77 69 64 | 74 68 20 63 74 6c 2d 66 |rame-wid|th ctl-f|
|00004f60| 72 61 6d 65 2d 68 65 69 | 67 68 74 29 20 22 70 18 |rame-hei|ght) "p.|
|00004f70| 09 83 38 01 c2 09 21 83 | 38 01 c3 c2 09 21 21 83 |..8...!.|8....!!.|
|00004f80| 38 01 c4 8e 09 71 88 c5 | 0e 06 21 1e 07 c8 0e 07 |8....q..|..!.....|
|00004f90| 21 1e 09 ca cb cc 0e 09 | 5c 22 41 21 1e 0d ca cb |!.......|\"A!....|
|00004fa0| ce 0e 09 5c 22 41 21 1e | 0f d0 0e 07 21 1e 11 0e |...\"A!.|....!...|
|00004fb0| 12 1e 13 d4 1e 15 d4 1e | 16 d4 1e 17 d4 1e 18 0e |........|........|
|00004fc0| 19 89 5c 5c 16 15 0e 19 | da 5f 16 16 0e 0d 0e 16 |..\\....|._......|
|00004fd0| 5a 0e 1b 5a 16 17 0e 0f | 0e 1c 83 8f 00 0e 13 1e |Z..Z....|........|
|00004fe0| 1d 0e 1e 83 81 00 df 0e | 1d 21 d0 0e 1d 21 a5 82 |........|.!...!..|
|00004ff0| 85 00 e0 0e 1d 21 29 0e | 21 0e 15 5c 5c 5f 82 d0 |.....!).|!..\\_..|
|00005000| 00 0e 11 0e 07 1e 1d 0e | 1e 83 a6 00 df 0e 1d 21 |........|.......!|
|00005010| d0 0e 1d 21 a5 82 aa 00 | e0 0e 1d 21 29 5f 0e 13 |...!....|...!)_..|
|00005020| 1e 1d 0e 1e 83 c1 00 df | 0e 1d 21 d0 0e 1d 21 a5 |........|..!...!.|
|00005030| 82 c5 00 e0 0e 1d 21 29 | 0e 5c 22 0e 23 5c 5c 0e |......!)|.\".#\\.|
|00005040| 15 5c 5c 5f 5a 5c 5c 16 | 18 0e 17 e4 20 0e 25 89 |.\\_Z\\.|.... .%.|
|00005050| 5c 5c 0e 13 1e 1d 0e 1e | 83 ef 00 e6 0e 27 e8 0e |\\......|.....'..|
|00005060| 1d 21 5c 22 82 f3 00 e9 | 0e 1d 21 29 5f 5a 5e 16 |.!\"....|..!)_Z^.|
|00005070| 17 0e 18 ea 20 0e 5c 22 | 0e 13 1e 1d 0e 1e 83 14 |.... .\"|........|
|00005080| 01 df 0e 1d 21 d0 0e 1d | 21 a5 82 18 01 e0 0e 1d |....!...|!.......|
|00005090| 21 29 5f 5a 5e 16 18 0e | 17 eb 5d 16 17 0e 18 eb |!)_Z^...|..].....|
|000050a0| 5d 16 18 cc 0e 17 42 ce | 0e 18 2e 0b 42 44 82 43 |].....B.|....BD.C|
|000050b0| 01 0e 2c ed 3d 86 43 01 | ee 0e 2f 21 29 87 22 20 |..,.=.C.|../!)." |
|000050c0| 5b 53 74 61 72 74 42 75 | 66 66 65 72 20 63 74 6c |[StartBu|ffer ctl|
|000050d0| 2d 62 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |-buffer |get-buff|
|000050e0| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 28 |er buffe|r-name (|
|000050f0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00005100| 74 42 75 66 66 65 72 29 | 29 20 77 69 6e 64 6f 77 |tBuffer)|) window|
|00005110| 2d 66 72 61 6d 65 20 65 | 64 69 66 66 2d 77 69 6e |-frame e|diff-win|
|00005120| 64 6f 77 2d 41 20 66 72 | 61 6d 65 2d 41 20 66 72 |dow-A fr|ame-A fr|
|00005130| 61 6d 65 2d 70 61 72 61 | 6d 65 74 65 72 73 20 66 |ame-para|meters f|
|00005140| 72 61 6d 65 2d 41 2d 70 | 61 72 61 6d 65 74 65 72 |rame-A-p|arameter|
|00005150| 73 20 65 76 61 6c 20 61 | 73 73 6f 63 20 74 6f 70 |s eval a|ssoc top|
|00005160| 20 66 72 61 6d 65 2d 41 | 2d 74 6f 70 20 6c 65 66 | frame-A|-top lef|
|00005170| 74 20 66 72 61 6d 65 2d | 41 2d 6c 65 66 74 20 66 |t frame-|A-left f|
|00005180| 72 61 6d 65 2d 77 69 64 | 74 68 20 66 72 61 6d 65 |rame-wid|th frame|
|00005190| 2d 41 2d 77 69 64 74 68 | 20 65 64 69 66 66 2d 63 |-A-width| ediff-c|
|000051a0| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 20 63 74 6c |ontrol-f|rame ctl|
|000051b0| 2d 66 72 61 6d 65 20 6e | 69 6c 20 68 6f 72 69 7a |-frame n|il horiz|
|000051c0| 6f 6e 74 61 6c 2d 61 64 | 6a 75 73 74 6d 65 6e 74 |ontal-ad|justment|
|000051d0| 20 75 70 77 61 72 64 2d | 61 64 6a 75 73 74 6d 65 | upward-|adjustme|
|000051e0| 6e 74 20 63 74 6c 2d 66 | 72 61 6d 65 2d 74 6f 70 |nt ctl-f|rame-top|
|000051f0| 20 63 74 6c 2d 66 72 61 | 6d 65 2d 6c 65 66 74 20 | ctl-fra|me-left |
|00005200| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ediff-co|ntrol-bu|
|00005210| 66 66 65 72 2d 6e 75 6d | 62 65 72 20 2d 31 34 20 |ffer-num|ber -14 |
|00005220| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 66 72 |ediff-co|ntrol-fr|
|00005230| 61 6d 65 2d 75 70 77 61 | 72 64 2d 73 68 69 66 74 |ame-upwa|rd-shift|
|00005240| 20 65 64 69 66 66 2d 75 | 73 65 2d 6c 6f 6e 67 2d | ediff-u|se-long-|
|00005250| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 20 66 72 61 |help-mes|sage fra|
|00005260| 6d 65 20 65 64 69 66 66 | 2d 78 65 6d 61 63 73 2d |me ediff|-xemacs-|
|00005270| 70 20 66 72 61 6d 65 2d | 70 69 78 65 6c 2d 77 69 |p frame-|pixel-wi|
|00005280| 64 74 68 20 66 72 61 6d | 65 2d 63 68 61 72 2d 77 |dth fram|e-char-w|
|00005290| 69 64 74 68 20 65 64 69 | 66 66 2d 77 69 64 65 2d |idth edi|ff-wide-|
|000052a0| 63 6f 6e 74 72 6f 6c 2d | 66 72 61 6d 65 2d 72 69 |control-|frame-ri|
|000052b0| 67 68 74 77 61 72 64 2d | 73 68 69 66 74 20 63 74 |ghtward-|shift ct|
|000052c0| 6c 2d 66 72 61 6d 65 2d | 77 69 64 74 68 20 65 64 |l-frame-|width ed|
|000052d0| 69 66 66 2d 6e 61 72 72 | 6f 77 2d 63 6f 6e 74 72 |iff-narr|ow-contr|
|000052e0| 6f 6c 2d 66 72 61 6d 65 | 2d 6c 65 66 74 77 61 72 |ol-frame|-leftwar|
|000052f0| 64 2d 73 68 69 66 74 20 | 65 64 69 66 66 2d 64 69 |d-shift |ediff-di|
|00005300| 73 70 6c 61 79 2d 70 69 | 78 65 6c 2d 68 65 69 67 |splay-pi|xel-heig|
|00005310| 68 74 20 63 74 6c 2d 66 | 72 61 6d 65 2d 68 65 69 |ht ctl-f|rame-hei|
|00005320| 67 68 74 20 67 6c 79 70 | 68 2d 68 65 69 67 68 74 |ght glyp|h-height|
|00005330| 20 65 64 69 66 66 2d 48 | 2d 67 6c 79 70 68 20 73 | ediff-H|-glyph s|
|00005340| 65 6c 65 63 74 65 64 2d | 77 69 6e 64 6f 77 20 66 |elected-|window f|
|00005350| 72 61 6d 65 2d 63 68 61 | 72 2d 68 65 69 67 68 74 |rame-cha|r-height|
|00005360| 20 65 64 69 66 66 2d 64 | 69 73 70 6c 61 79 2d 70 | ediff-d|isplay-p|
|00005370| 69 78 65 6c 2d 77 69 64 | 74 68 20 31 20 74 68 69 |ixel-wid|th 1 thi|
|00005380| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|00005390| 71 75 69 74 20 65 72 72 | 6f 72 20 65 64 69 66 66 |quit err|or ediff|
|000053a0| 2d 4b 49 4c 4c 45 44 2d | 56 49 54 41 4c 2d 42 55 |-KILLED-|VITAL-BU|
|000053b0| 46 46 45 52 5d 20 37 5d | 29 0a 28 64 65 66 61 6c |FFER] 7]|).(defal|
|000053c0| 69 61 73 20 27 65 64 69 | 66 66 2d 78 65 6d 61 63 |ias 'edi|ff-xemac|
|000053d0| 73 2d 73 65 6c 65 63 74 | 2d 66 72 61 6d 65 2d 68 |s-select|-frame-h|
|000053e0| 6f 6f 6b 20 23 5b 6e 69 | 6c 20 22 c0 20 09 9a 85 |ook #[ni|l ". ...|
|000053f0| 0f 00 5c 6e 3f 85 0f 00 | c3 09 21 87 22 20 5b 73 |..\n?...|..!." [s|
|00005400| 65 6c 65 63 74 65 64 2d | 66 72 61 6d 65 20 65 64 |elected-|frame ed|
|00005410| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 66 72 61 6d |iff-cont|rol-fram|
|00005420| 65 20 65 64 69 66 66 2d | 75 73 65 2d 6c 6f 6e 67 |e ediff-|use-long|
|00005430| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 72 61 |-help-me|ssage ra|
|00005440| 69 73 65 2d 66 72 61 6d | 65 5d 20 32 5d 29 0a 23 |ise-fram|e] 2]).#|
|00005450| 40 33 32 36 20 43 6f 6e | 73 74 72 75 63 74 20 61 |@326 Con|struct a|
|00005460| 6e 20 61 6c 69 73 74 20 | 6f 66 20 70 61 72 61 6d |n alist |of param|
|00005470| 65 74 65 72 73 20 66 6f | 72 20 74 68 65 20 77 69 |eters fo|r the wi|
|00005480| 64 65 20 64 69 73 70 6c | 61 79 2e 0a 53 61 76 65 |de displ|ay..Save|
|00005490| 73 20 74 68 65 20 6f 6c | 64 20 66 72 61 6d 65 20 |s the ol|d frame |
|000054a0| 70 61 72 61 6d 65 74 65 | 72 73 20 69 6e 20 60 65 |paramete|rs in `e|
|000054b0| 64 69 66 66 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |diff-wid|e-displa|
|000054c0| 79 2d 6f 72 69 67 2d 70 | 61 72 61 6d 65 74 65 72 |y-orig-p|arameter|
|000054d0| 73 27 2e 0a 54 68 65 20 | 66 72 61 6d 65 20 74 6f |s'..The |frame to|
|000054e0| 20 62 65 20 72 65 73 69 | 7a 65 64 20 69 73 20 6b | be resi|zed is k|
|000054f0| 65 70 74 20 69 6e 20 60 | 65 64 69 66 66 2d 77 69 |ept in `|ediff-wi|
|00005500| 64 65 2d 64 69 73 70 6c | 61 79 2d 66 72 61 6d 65 |de-displ|ay-frame|
|00005510| 27 2e 0a 54 68 69 73 20 | 66 75 6e 63 74 69 6f 6e |'..This |function|
|00005520| 20 6d 6f 64 69 66 69 65 | 73 20 6f 6e 6c 79 20 74 | modifie|s only t|
|00005530| 68 65 20 6c 65 66 74 20 | 6d 61 72 67 69 6e 20 61 |he left |margin a|
|00005540| 6e 64 20 74 68 65 20 77 | 69 64 74 68 20 6f 66 20 |nd the w|idth of |
|00005550| 74 68 65 20 64 69 73 70 | 6c 61 79 2e 0a 49 74 20 |the disp|lay..It |
|00005560| 61 73 73 75 6d 65 73 20 | 74 68 61 74 20 69 74 20 |assumes |that it |
|00005570| 69 73 20 63 61 6c 6c 65 | 64 20 66 72 6f 6d 20 77 |is calle|d from w|
|00005580| 69 74 68 69 6e 20 74 68 | 65 20 63 6f 6e 74 72 6f |ithin th|e contro|
|00005590| 6c 20 62 75 66 66 65 72 | 2e 1f 0a 28 64 65 66 61 |l buffer|...(defa|
|000055a0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 61 6b 65 |lias 'ed|iff-make|
|000055b0| 2d 77 69 64 65 2d 64 69 | 73 70 6c 61 79 20 23 5b |-wide-di|splay #[|
|000055c0| 6e 69 6c 20 22 c0 c1 21 | 84 5c 6e 00 c2 c3 21 88 |nil "..!|.\n...!.|
|000055d0| c4 0d 21 1e 06 c7 0e 06 | 21 1e 08 0e 06 1e 09 0e |..!.....|!.......|
|000055e0| 5c 6e 83 2a 00 cb 0e 09 | 21 cc 0e 09 21 a5 82 2e |\n.*....|!...!...|
|000055f0| 00 cd 0e 09 21 29 1e 0e | c1 20 0e 0e a5 cf 5a 1e |....!)..|. ....Z.|
|00005600| 10 d1 d2 d3 d4 d1 0e 08 | 5c 22 41 21 5d 42 d5 d4 |........|\"A!]B..|
|00005610| d5 0e 08 5c 22 41 42 44 | 16 16 0e 06 16 17 d8 0e |...\"ABD|........|
|00005620| 06 d1 0e 0e 42 d5 0e 10 | 42 44 5c 22 2c 87 22 20 |....B...|BD\",." |
|00005630| 5b 66 62 6f 75 6e 64 70 | 20 65 64 69 66 66 2d 64 |[fboundp| ediff-d|
|00005640| 69 73 70 6c 61 79 2d 70 | 69 78 65 6c 2d 77 69 64 |isplay-p|ixel-wid|
|00005650| 74 68 20 65 72 72 6f 72 | 20 22 43 61 6e 27 74 20 |th error| "Can't |
|00005660| 64 65 74 65 72 6d 69 6e | 65 20 64 69 73 70 6c 61 |determin|e displa|
|00005670| 79 20 77 69 64 74 68 2e | 22 20 77 69 6e 64 6f 77 |y width.|" window|
|00005680| 2d 66 72 61 6d 65 20 65 | 64 69 66 66 2d 77 69 6e |-frame e|diff-win|
|00005690| 64 6f 77 2d 41 20 66 72 | 61 6d 65 2d 41 20 66 72 |dow-A fr|ame-A fr|
|000056a0| 61 6d 65 2d 70 61 72 61 | 6d 65 74 65 72 73 20 66 |ame-para|meters f|
|000056b0| 72 61 6d 65 2d 41 2d 70 | 61 72 61 6d 73 20 66 72 |rame-A-p|arams fr|
|000056c0| 61 6d 65 20 65 64 69 66 | 66 2d 78 65 6d 61 63 73 |ame edif|f-xemacs|
|000056d0| 2d 70 20 66 72 61 6d 65 | 2d 70 69 78 65 6c 2d 77 |-p frame|-pixel-w|
|000056e0| 69 64 74 68 20 66 72 61 | 6d 65 2d 77 69 64 74 68 |idth fra|me-width|
|000056f0| 20 66 72 61 6d 65 2d 63 | 68 61 72 2d 77 69 64 74 | frame-c|har-widt|
|00005700| 68 20 63 77 20 35 20 77 | 64 20 6c 65 66 74 20 30 |h cw 5 w|d left 0|
|00005710| 20 65 76 61 6c 20 61 73 | 73 6f 63 20 77 69 64 74 | eval as|soc widt|
|00005720| 68 20 65 64 69 66 66 2d | 77 69 64 65 2d 64 69 73 |h ediff-|wide-dis|
|00005730| 70 6c 61 79 2d 6f 72 69 | 67 2d 70 61 72 61 6d 65 |play-ori|g-parame|
|00005740| 74 65 72 73 20 65 64 69 | 66 66 2d 77 69 64 65 2d |ters edi|ff-wide-|
|00005750| 64 69 73 70 6c 61 79 2d | 66 72 61 6d 65 20 6d 6f |display-|frame mo|
|00005760| 64 69 66 79 2d 66 72 61 | 6d 65 2d 70 61 72 61 6d |dify-fra|me-param|
|00005770| 65 74 65 72 73 5d 20 36 | 20 28 23 24 20 2e 20 32 |eters] 6| (#$ . 2|
|00005780| 31 35 38 39 29 5d 29 0a | 28 64 65 66 61 6c 69 61 |1589)]).|(defalia|
|00005790| 73 20 27 65 64 69 66 66 | 2d 72 65 66 72 65 73 68 |s 'ediff|-refresh|
|000057a0| 2d 6d 6f 64 65 2d 6c 69 | 6e 65 73 20 23 5b 6e 69 |-mode-li|nes #[ni|
|000057b0| 6c 20 22 c0 89 89 89 19 | 1a 1b 1c c0 1d 0e 06 89 |l ".....|........|
|000057c0| 15 c7 59 85 17 00 0d 0e | 08 57 29 83 f4 00 0e 09 |..Y.....|.W).....|
|000057d0| 85 3c 00 ca 0e 09 21 85 | 3c 00 cb ca 0e 09 21 21 |.<....!.|<.....!!|
|000057e0| 85 3c 00 cc cd ce cf 5c | 22 21 4a 0e 06 48 d0 48 |.<.....\|"!J..H.H|
|000057f0| 12 0e 11 85 49 00 0e 11 | 0e 06 48 c7 48 11 0e 09 |....I...|..H.H...|
|00005800| 85 6b 00 ca 0e 09 21 85 | 6b 00 cb ca 0e 09 21 21 |.k....!.|k.....!!|
|00005810| 85 6b 00 cc cd ce d2 5c | 22 21 4a 0e 06 48 d0 48 |.k.....\|"!J..H.H|
|00005820| 14 0e 09 85 8d 00 ca 0e | 09 21 85 8d 00 cb ca 0e |........|.!......|
|00005830| 09 21 21 85 8d 00 cc cd | ce d3 5c 22 21 4a 0e 06 |.!!.....|..\"!J..|
|00005840| 48 d0 48 13 5c 66 83 99 | 00 cd d4 5c 66 5c 22 82 |H.H.\f..|...\f\".|
|00005850| 9a 00 d5 14 0b 83 a6 00 | cd d4 0b 5c 22 82 a7 00 |........|...\"...|
|00005860| d5 13 0e 09 83 ef 00 ca | 0e 09 21 83 ef 00 cb ca |........|..!.....|
|00005870| 0e 09 21 21 83 ef 00 5c | 6e 84 c5 00 09 83 ef 00 |..!!...\|n.......|
|00005880| cd d6 5c 6e 86 cc 00 d5 | 09 83 d6 00 d7 09 50 82 |..\n....|......P.|
|00005890| d7 00 d5 0e 11 83 ea 00 | 0e 11 0e 06 48 d8 48 83 |........|....H.H.|
|000058a0| ea 00 d9 82 eb 00 d5 24 | 82 f0 00 d5 12 82 fa 00 |.......$|........|
|000058b0| d5 14 d5 13 d5 12 da 20 | 83 10 01 0e 1b 83 10 01 |....... |........|
|000058c0| 0e 1c 0e 1d 9a 83 10 01 | de 82 11 01 df 0e 20 e1 |........|...... .|
|000058d0| 45 16 5c 22 da 20 83 2f | 01 0e 1b 83 2f 01 0e 1c |E.\". ./|..../...|
|000058e0| 0e 1d 9a 83 2f 01 e3 e4 | 21 82 31 01 e5 20 16 20 |..../...|!.1.. . |
|000058f0| e6 20 88 da 20 83 45 01 | e7 0e 28 21 83 45 01 e9 |. .. .E.|..(!.E..|
|00005900| 20 88 70 1e 2a 0e 2b 83 | 82 01 ca 0e 2b 21 83 82 | .p.*.+.|....+!..|
|00005910| 01 cb ca 0e 2b 21 21 83 | 82 01 ec 8e 0e 2b 71 88 |....+!!.|.....+q.|
|00005920| 5c 66 16 2d 0e 5c 22 40 | ee 9d 83 74 01 ef 0e 5c |\f.-.\"@|...t...\|
|00005930| 22 38 16 5c 22 f0 ed 0e | 5c 22 45 16 5c 22 e6 20 |"8.\"...|\"E.\". |
|00005940| 88 29 82 8e 01 0e 31 f2 | 3d 84 8e 01 f3 0e 34 21 |.)....1.|=.....4!|
|00005950| 88 29 70 1e 2a 0e 35 83 | cc 01 ca 0e 35 21 83 cc |.)p.*.5.|....5!..|
|00005960| 01 cb ca 0e 35 21 21 83 | cc 01 f6 8e 0e 35 71 88 |....5!!.|.....5q.|
|00005970| 0b 16 2d 0e 5c 22 40 ee | 9d 83 be 01 ef 0e 5c 22 |..-.\"@.|......\"|
|00005980| 38 16 5c 22 f7 ed 0e 5c | 22 45 16 5c 22 e6 20 88 |8.\"...\|"E.\". .|
|00005990| 29 82 d8 01 0e 31 f2 3d | 84 d8 01 f3 0e 34 21 88 |)....1.=|.....4!.|
|000059a0| 29 0e 38 83 28 02 70 1e | 2a 0e 09 83 1b 02 ca 0e |).8.(.p.|*.......|
|000059b0| 09 21 83 1b 02 cb ca 0e | 09 21 21 83 1b 02 f9 8e |.!......|.!!.....|
|000059c0| 0e 09 71 88 5c 6e 16 2d | 0e 5c 22 40 ee 9d 83 0d |..q.\n.-|.\"@....|
|000059d0| 02 ef 0e 5c 22 38 16 5c | 22 fa ed 0e 5c 22 45 16 |...\"8.\|"...\"E.|
|000059e0| 5c 22 e6 20 88 29 82 27 | 02 0e 31 f2 3d 84 27 02 |\". .).'|..1.=.'.|
|000059f0| f3 0e 34 21 88 29 0e 3b | 85 a6 02 ca 0e 3b 21 85 |..4!.).;|.....;!.|
|00005a00| a6 02 cb ca 0e 3b 21 21 | 85 a6 02 70 1e 2a 0e 3b |.....;!!|...p.*.;|
|00005a10| 83 9a 02 ca 0e 3b 21 83 | 9a 02 cb ca 0e 3b 21 21 |.....;!.|.....;!!|
|00005a20| 83 9a 02 fc 8e 0e 3b 71 | 88 0e 5c 22 40 ee 9d 83 |......;q|..\"@...|
|00005a30| 69 02 ef 0e 5c 22 38 16 | 5c 22 fd 09 3b 84 73 02 |i...\"8.|\"..;.s.|
|00005a40| d5 82 90 02 fe ff 09 5c | 22 83 80 02 81 40 00 82 |.......\|"....@..|
|00005a50| 90 02 fe 81 41 00 09 5c | 22 83 8f 02 81 42 00 82 |....A..\|"....B..|
|00005a60| 90 02 d5 0e 5c 22 45 89 | 16 5c 22 29 82 a5 02 0e |....\"E.|.\")....|
|00005a70| 31 f2 3d 86 a5 02 f3 0e | 34 21 29 2c 87 22 20 5b |1.=.....|4!),." [|
|00005a80| 6e 69 6c 20 62 75 66 2d | 43 2d 73 74 61 74 65 2d |nil buf-|C-state-|
|00005a90| 6d 65 72 67 65 20 62 75 | 66 2d 43 2d 73 74 61 74 |merge bu|f-C-stat|
|00005aa0| 65 2d 64 69 66 66 20 62 | 75 66 2d 42 2d 73 74 61 |e-diff b|uf-B-sta|
|00005ab0| 74 65 2d 64 69 66 66 20 | 62 75 66 2d 41 2d 73 74 |te-diff |buf-A-st|
|00005ac0| 61 74 65 2d 64 69 66 66 | 20 6e 20 65 64 69 66 66 |ate-diff| n ediff|
|00005ad0| 2d 63 75 72 72 65 6e 74 | 2d 64 69 66 66 65 72 65 |-current|-differe|
|00005ae0| 6e 63 65 20 30 20 65 64 | 69 66 66 2d 6e 75 6d 62 |nce 0 ed|iff-numb|
|00005af0| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00005b00| 73 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 43 |s ediff-|buffer-C|
|00005b10| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|00005b20| 65 72 2d 6e 61 6d 65 20 | 69 6e 74 65 72 6e 20 66 |er-name |intern f|
|00005b30| 6f 72 6d 61 74 20 22 65 | 64 69 66 66 2d 64 69 66 |ormat "e|diff-dif|
|00005b40| 66 65 72 65 6e 63 65 2d | 76 65 63 74 6f 72 2d 25 |ference-|vector-%|
|00005b50| 53 22 20 43 20 33 20 65 | 64 69 66 66 2d 73 74 61 |S" C 3 e|diff-sta|
|00005b60| 74 65 2d 6f 66 2d 6d 65 | 72 67 65 20 41 20 42 20 |te-of-me|rge A B |
|00005b70| 22 5b 25 73 5d 20 22 20 | 22 22 20 22 5b 25 73 25 |"[%s] " |"" "[%s%|
|00005b80| 73 25 73 5d 20 22 20 22 | 20 22 20 31 20 22 20 41 |s%s] " "| " 1 " A|
|00005b90| 6e 63 65 73 74 6f 72 45 | 6d 70 74 79 22 20 65 64 |ncestorE|mpty" ed|
|00005ba0| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 64 69 73 70 6c |iff-wind|ow-displ|
|00005bb0| 61 79 2d 70 20 65 64 69 | 66 66 2d 6d 75 6c 74 69 |ay-p edi|ff-multi|
|00005bc0| 66 72 61 6d 65 20 65 64 | 69 66 66 2d 68 65 6c 70 |frame ed|iff-help|
|00005bd0| 2d 6d 65 73 73 61 67 65 | 20 65 64 69 66 66 2d 62 |-message| ediff-b|
|00005be0| 72 69 65 66 2d 6d 65 73 | 73 61 67 65 2d 73 74 72 |rief-mes|sage-str|
|00005bf0| 69 6e 67 20 22 20 20 20 | 22 20 22 2d 2d 20 22 20 |ing "   |" "-- " |
|00005c00| 6d 6f 64 65 2d 6c 69 6e | 65 2d 62 75 66 66 65 72 |mode-lin|e-buffer|
|00005c10| 2d 69 64 65 6e 74 69 66 | 69 63 61 74 69 6f 6e 20 |-identif|ication |
|00005c20| 22 20 20 20 20 20 20 51 | 75 69 63 6b 20 48 65 6c |"      Q|uick Hel|
|00005c30| 70 22 20 6d 6f 64 65 2d | 6c 69 6e 65 2d 66 6f 72 |p" mode-|line-for|
|00005c40| 6d 61 74 20 65 64 69 66 | 66 2d 6d 61 6b 65 2d 6e |mat edif|f-make-n|
|00005c50| 61 72 72 6f 77 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |arrow-co|ntrol-bu|
|00005c60| 66 66 65 72 2d 69 64 20 | 73 6b 69 70 2d 6e 61 6d |ffer-id |skip-nam|
|00005c70| 65 20 65 64 69 66 66 2d | 6d 61 6b 65 2d 77 69 64 |e ediff-|make-wid|
|00005c80| 65 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |e-contro|l-buffer|
|00005c90| 2d 69 64 20 66 6f 72 63 | 65 2d 6d 6f 64 65 2d 6c |-id forc|e-mode-l|
|00005ca0| 69 6e 65 2d 75 70 64 61 | 74 65 20 66 72 61 6d 65 |ine-upda|te frame|
|00005cb0| 2d 6c 69 76 65 2d 70 20 | 65 64 69 66 66 2d 63 6f |-live-p |ediff-co|
|00005cc0| 6e 74 72 6f 6c 2d 66 72 | 61 6d 65 20 65 64 69 66 |ntrol-fr|ame edif|
|00005cd0| 66 2d 72 65 66 72 65 73 | 68 2d 63 6f 6e 74 72 6f |f-refres|h-contro|
|00005ce0| 6c 2d 66 72 61 6d 65 20 | 53 74 61 72 74 42 75 66 |l-frame |StartBuf|
|00005cf0| 66 65 72 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |fer edif|f-buffer|
|00005d00| 2d 41 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |-A ((set|-buffer |
|00005d10| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 64 |StartBuf|fer)) ed|
|00005d20| 69 66 66 2d 64 69 66 66 | 2d 73 74 61 74 75 73 20 |iff-diff|-status |
|00005d30| 28 22 20 41 3a 20 22 20 | 22 20 42 3a 20 22 20 22 |(" A: " |" B: " "|
|00005d40| 20 43 3a 20 22 20 22 20 | 41 6e 63 65 73 74 6f 72 | C: " " |Ancestor|
|00005d50| 3a 20 22 29 20 32 20 22 | 20 41 3a 20 22 20 74 68 |: ") 2 "| A: " th|
|00005d60| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00005d70| 2d 71 75 69 74 20 65 72 | 72 6f 72 20 65 64 69 66 |-quit er|ror edif|
|00005d80| 66 2d 4b 49 4c 4c 45 44 | 2d 56 49 54 41 4c 2d 42 |f-KILLED|-VITAL-B|
|00005d90| 55 46 46 45 52 20 65 64 | 69 66 66 2d 62 75 66 66 |UFFER ed|iff-buff|
|00005da0| 65 72 2d 42 20 28 28 73 | 65 74 2d 62 75 66 66 65 |er-B ((s|et-buffe|
|00005db0| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00005dc0| 22 20 42 3a 20 22 20 65 | 64 69 66 66 2d 33 77 61 |" B: " e|diff-3wa|
|00005dd0| 79 2d 6a 6f 62 20 28 28 | 73 65 74 2d 62 75 66 66 |y-job ((|set-buff|
|00005de0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00005df0| 20 22 20 43 3a 20 22 20 | 65 64 69 66 66 2d 61 6e | " C: " |ediff-an|
|00005e00| 63 65 73 74 6f 72 2d 62 | 75 66 66 65 72 20 28 28 |cestor-b|uffer ((|
|00005e10| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00005e20| 42 75 66 66 65 72 29 29 | 20 22 20 41 6e 63 65 73 |Buffer))| " Ances|
|00005e30| 74 6f 72 3a 20 22 20 73 | 74 72 69 6e 67 2d 6d 61 |tor: " s|tring-ma|
|00005e40| 74 63 68 20 22 70 72 65 | 66 65 72 2d 41 22 20 22 |tch "pre|fer-A" "|
|00005e50| 5b 3d 64 69 66 66 28 42 | 29 5d 20 22 20 22 70 72 |[=diff(B|)] " "pr|
|00005e60| 65 66 65 72 2d 42 22 20 | 22 5b 3d 64 69 66 66 28 |efer-B" |"[=diff(|
|00005e70| 41 29 5d 20 22 5d 20 37 | 5d 29 0a 28 64 65 66 61 |A)] "] 7|]).(defa|
|00005e80| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 72 65 66 72 |lias 'ed|iff-refr|
|00005e90| 65 73 68 2d 63 6f 6e 74 | 72 6f 6c 2d 66 72 61 6d |esh-cont|rol-fram|
|00005ea0| 65 20 23 5b 6e 69 6c 20 | 22 08 83 11 00 c1 5c 6e |e #[nil |".....\n|
|00005eb0| c3 c4 20 42 c5 c6 20 42 | 44 5c 22 87 c4 20 16 07 |.. B.. B|D\".. ..|
|00005ec0| c6 20 16 08 c1 5c 6e c9 | 5c 22 87 22 20 5b 65 64 |. ...\n.|\"." [ed|
|00005ed0| 69 66 66 2d 65 6d 61 63 | 73 2d 70 20 6d 6f 64 69 |iff-emac|s-p modi|
|00005ee0| 66 79 2d 66 72 61 6d 65 | 2d 70 61 72 61 6d 65 74 |fy-frame|-paramet|
|00005ef0| 65 72 73 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |ers edif|f-contro|
|00005f00| 6c 2d 66 72 61 6d 65 20 | 74 69 74 6c 65 20 65 64 |l-frame |title ed|
|00005f10| 69 66 66 2d 6d 61 6b 65 | 2d 62 61 73 65 2d 74 69 |iff-make|-base-ti|
|00005f20| 74 6c 65 20 69 63 6f 6e | 2d 6e 61 6d 65 20 65 64 |tle icon|-name ed|
|00005f30| 69 66 66 2d 6d 61 6b 65 | 2d 6e 61 72 72 6f 77 2d |iff-make|-narrow-|
|00005f40| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 2d 69 |control-|buffer-i|
|00005f50| 64 20 66 72 61 6d 65 2d | 74 69 74 6c 65 2d 66 6f |d frame-|title-fo|
|00005f60| 72 6d 61 74 20 66 72 61 | 6d 65 2d 69 63 6f 6e 2d |rmat fra|me-icon-|
|00005f70| 74 69 74 6c 65 2d 66 6f | 72 6d 61 74 20 28 6e 69 |title-fo|rmat (ni|
|00005f80| 6c 29 5d 20 35 5d 29 0a | 28 64 65 66 61 6c 69 61 |l)] 5]).|(defalia|
|00005f90| 73 20 27 65 64 69 66 66 | 2d 6d 61 6b 65 2d 6e 61 |s 'ediff|-make-na|
|00005fa0| 72 72 6f 77 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |rrow-con|trol-buf|
|00005fb0| 66 65 72 2d 69 64 20 23 | 5b 28 26 6f 70 74 69 6f |fer-id #|[(&optio|
|00005fc0| 6e 61 6c 20 73 6b 69 70 | 2d 6e 61 6d 65 29 20 22 |nal skip|-name) "|
|00005fd0| 08 83 08 00 c1 82 5c 6e | 00 c2 20 0b c4 57 83 18 |......\n|.. ..W..|
|00005fe0| 00 c5 c6 0e 07 5c 22 82 | 2e 00 0b 0e 07 59 83 27 |.....\".|.....Y.'|
|00005ff0| 00 c5 c8 0e 07 5c 22 82 | 2e 00 c5 c9 0b 54 0e 07 |.....\".|.....T..|
|00006000| 23 50 87 22 20 5b 73 6b | 69 70 2d 6e 61 6d 65 20 |#P." [sk|ip-name |
|00006010| 22 20 22 20 65 64 69 66 | 66 2d 6d 61 6b 65 2d 62 |" " edif|f-make-b|
|00006020| 61 73 65 2d 74 69 74 6c | 65 20 65 64 69 66 66 2d |ase-titl|e ediff-|
|00006030| 63 75 72 72 65 6e 74 2d | 64 69 66 66 65 72 65 6e |current-|differen|
|00006040| 63 65 20 30 20 66 6f 72 | 6d 61 74 20 22 20 5f 2f |ce 0 for|mat " _/|
|00006050| 25 64 22 20 65 64 69 66 | 66 2d 6e 75 6d 62 65 72 |%d" edif|f-number|
|00006060| 2d 6f 66 2d 64 69 66 66 | 65 72 65 6e 63 65 73 20 |-of-diff|erences |
|00006070| 22 20 24 2f 25 64 22 20 | 22 20 25 64 2f 25 64 22 |" $/%d" |" %d/%d"|
|00006080| 5d 20 35 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 5]).(d|efalias |
|00006090| 27 65 64 69 66 66 2d 6d | 61 6b 65 2d 62 61 73 65 |'ediff-m|ake-base|
|000060a0| 2d 74 69 74 6c 65 20 23 | 5b 6e 69 6c 20 22 c0 c1 |-title #|[nil "..|
|000060b0| 5c 6e 5c 22 41 0b 50 87 | 22 20 5b 61 73 73 6f 63 |\n\"A.P.|" [assoc|
|000060c0| 20 6e 61 6d 65 20 65 64 | 69 66 66 2d 63 6f 6e 74 | name ed|iff-cont|
|000060d0| 72 6f 6c 2d 66 72 61 6d | 65 2d 70 61 72 61 6d 65 |rol-fram|e-parame|
|000060e0| 74 65 72 73 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |ters edi|ff-contr|
|000060f0| 6f 6c 2d 62 75 66 66 65 | 72 2d 73 75 66 66 69 78 |ol-buffe|r-suffix|
|00006100| 5d 20 33 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 3]).(d|efalias |
|00006110| 27 65 64 69 66 66 2d 6d | 61 6b 65 2d 77 69 64 65 |'ediff-m|ake-wide|
|00006120| 2d 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 2d |-control|-buffer-|
|00006130| 69 64 20 23 5b 6e 69 6c | 20 22 08 c1 57 83 5c 66 |id #[nil| "..W.\f|
|00006140| 00 c2 c3 5c 66 5c 22 43 | 87 08 5c 66 59 83 18 00 |...\f\"C|..\fY...|
|00006150| c2 c5 5c 66 5c 22 43 87 | c2 c6 08 54 5c 66 23 43 |..\f\"C.|...T\f#C|
|00006160| 87 22 20 5b 65 64 69 66 | 66 2d 63 75 72 72 65 6e |." [edif|f-curren|
|00006170| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 30 20 66 |t-differ|ence 0 f|
|00006180| 6f 72 6d 61 74 20 22 25 | 25 62 20 20 20 41 74 20 |ormat "%|%b   At |
|00006190| 73 74 61 72 74 20 6f 66 | 20 25 64 20 64 69 66 66 |start of| %d diff|
|000061a0| 73 22 20 65 64 69 66 66 | 2d 6e 75 6d 62 65 72 2d |s" ediff|-number-|
|000061b0| 6f 66 2d 64 69 66 66 65 | 72 65 6e 63 65 73 20 22 |of-diffe|rences "|
|000061c0| 25 25 62 20 20 20 41 74 | 20 65 6e 64 20 6f 66 20 |%%b   At| end of |
|000061d0| 25 64 20 64 69 66 66 73 | 22 20 22 25 25 62 20 20 |%d diffs|" "%%b  |
|000061e0| 20 64 69 66 66 20 25 64 | 20 6f 66 20 25 64 22 5d | diff %d| of %d"]|
|000061f0| 20 34 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 | 4]).(de|falias '|
|00006200| 65 64 69 66 66 2d 67 65 | 74 2d 76 69 73 69 62 6c |ediff-ge|t-visibl|
|00006210| 65 2d 62 75 66 66 65 72 | 2d 77 69 6e 64 6f 77 20 |e-buffer|-window |
|00006220| 23 5b 28 62 75 66 66 29 | 20 22 08 85 1f 00 c1 08 |#[(buff)| "......|
|00006230| 21 85 1f 00 c2 c1 08 21 | 21 85 1f 00 0b 83 1b 00 |!......!|!.......|
|00006240| c4 08 c5 5c 22 87 c4 08 | c6 5c 22 87 22 20 5b 62 |...\"...|.\"." [b|
|00006250| 75 66 66 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |uff get-|buffer b|
|00006260| 75 66 66 65 72 2d 6e 61 | 6d 65 20 65 64 69 66 66 |uffer-na|me ediff|
|00006270| 2d 78 65 6d 61 63 73 2d | 70 20 67 65 74 2d 62 75 |-xemacs-|p get-bu|
|00006280| 66 66 65 72 2d 77 69 6e | 64 6f 77 20 74 20 76 69 |ffer-win|dow t vi|
|00006290| 73 69 62 6c 65 5d 20 33 | 5d 29 0a 28 64 65 66 61 |sible] 3|]).(defa|
|000062a0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6b 65 65 70 |lias 'ed|iff-keep|
|000062b0| 2d 77 69 6e 64 6f 77 2d | 63 6f 6e 66 69 67 20 23 |-window-|config #|
|000062c0| 5b 28 63 6f 6e 74 72 6f | 6c 2d 62 75 66 29 20 22 |[(contro|l-buf) "|
|000062d0| 08 70 3d 85 da 00 c1 20 | c2 55 3f 85 da 00 70 1b |.p=.... |.U?...p.|
|000062e0| 08 83 ce 00 c4 08 21 83 | ce 00 c5 c4 08 21 21 83 |......!.|.....!!.|
|000062f0| ce 00 c6 8e 08 71 88 0e | 07 0e 08 0e 09 0e 5c 6e |.....q..|......\n|
|00006300| 1e 0b 1e 5c 66 1e 0d 1e | 0e 0e 0d 1e 0f d0 0e 0f |...\f...|........|
|00006310| 21 85 4e 00 d1 20 3f 86 | 4e 00 d2 d3 0e 0f 21 21 |!.N.. ?.|N.....!!|
|00006320| 29 85 ca 00 0e 5c 66 1e | 0f d0 0e 0f 21 85 69 00 |)....\f.|....!.i.|
|00006330| d1 20 3f 86 69 00 d2 d3 | 0e 0f 21 21 29 85 ca 00 |. ?.i...|..!!)...|
|00006340| 0e 14 83 8d 00 0e 0b 1e | 0f d0 0e 0f 21 85 89 00 |........|....!...|
|00006350| d1 20 3f 86 89 00 d2 d3 | 0e 0f 21 21 29 85 ca 00 |. ?.....|..!!)...|
|00006360| d5 0e 0d 21 0e 16 3d 85 | ca 00 d5 0e 5c 66 21 0e |...!..=.|....\f!.|
|00006370| 17 3d 85 ca 00 0e 14 83 | b0 00 d5 0e 0b 21 0e 18 |.=......|.....!..|
|00006380| 3d 85 ca 00 0e 19 da db | 0e 0e 0e 0d 0e 5c 66 0e |=.......|.....\f.|
|00006390| 0b 0e 1c d1 20 85 c5 00 | 0e 1d 0e 1e 26 08 98 2d |.... ...|....&..-|
|000063a0| 82 d9 00 0e 1f e0 3d 86 | d9 00 e1 0e 5c 22 21 29 |......=.|....\"!)|
|000063b0| 87 22 20 5b 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 20 |." [cont|rol-buf |
|000063c0| 62 75 66 66 65 72 2d 73 | 69 7a 65 20 30 20 53 74 |buffer-s|ize 0 St|
|000063d0| 61 72 74 42 75 66 66 65 | 72 20 67 65 74 2d 62 75 |artBuffe|r get-bu|
|000063e0| 66 66 65 72 20 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ffer buf|fer-name|
|000063f0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
+--------+-------------------------+-------------------------+--------+--------+